diff --git a/src/storm/storage/jani/FunctionEliminator.cpp b/src/storm/storage/jani/FunctionEliminator.cpp
index ed2784d10..4d783c5be 100644
--- a/src/storm/storage/jani/FunctionEliminator.cpp
+++ b/src/storm/storage/jani/FunctionEliminator.cpp
@@ -176,13 +176,13 @@ namespace storm {
                     // Find the associated function definition
                     FunctionDefinition const* funDef = nullptr;
                     if (localFunctions != nullptr) {
-                        auto funDefIt = localFunctions->find(expression.getIdentifier());
+                        auto funDefIt = localFunctions->find(expression.getFunctionIdentifier());
                         if (funDefIt != localFunctions->end()) {
                             funDef = &(funDefIt->second);
                         }
                     }
                     if (globalFunctions != nullptr) {
-                        auto funDefIt = globalFunctions->find(expression.getIdentifier());
+                        auto funDefIt = globalFunctions->find(expression.getFunctionIdentifier());
                         if (funDefIt != globalFunctions->end()) {
                             funDef = &(funDefIt->second);
                         }
diff --git a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
index 6b17ba50c..e355c4113 100644
--- a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
+++ b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
@@ -67,7 +67,7 @@ namespace storm {
             for (uint64_t i = 0; i < expression.getNumberOfArguments(); ++i) {
                 newArguments.push_back(boost::any_cast<std::shared_ptr<BaseExpression const>>(expression.getArgument(i)->accept(*this, data)));
             }
-            return std::const_pointer_cast<BaseExpression const>(std::shared_ptr<BaseExpression>(new FunctionCallExpression(expression.getManager(), expression.getType(), expression.getIdentifier(), newArguments)));
+            return std::const_pointer_cast<BaseExpression const>(std::shared_ptr<BaseExpression>(new FunctionCallExpression(expression.getManager(), expression.getType(), expression.getFunctionIdentifier(), newArguments)));
         }
 
         // Explicitly instantiate the class with map and unordered_map.