From 0690b7c180baae7aa35858c8f65bf5d1b0835c2a Mon Sep 17 00:00:00 2001
From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 7 Mar 2013 11:32:41 +0000
Subject: [PATCH] Added name validation for other elements than variable,
 module, and enumeration. (refs #4138 #4146)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27026 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ui/plugin.xml            |   8 +
 .../ui/browser/nodes/EnumerationNode.java     |  18 +-
 .../ui/browser/nodes/FunctionLibraryNode.java |  14 +-
 .../sysdyn/ui/browser/nodes/FunctionNode.java |  16 +-
 .../sysdyn/ui/browser/nodes/ModelNode.java    |  10 +-
 .../sysdyn/ui/browser/nodes/ModuleNode.java   |  22 +-
 .../ui/browser/nodes/ModuleTypeNode.java      |   8 +-
 .../nodes/SharedFunctionLibraryNode.java      |  23 ++
 .../sysdyn/ui/browser/nodes/SheetNode.java    |   8 +-
 .../sysdyn/ui/browser/nodes/VariableNode.java |  22 +-
 .../participant/SysdynCopyPasteStrategy.java  |   4 +-
 .../ui/elements/HoverTextElementNoBounds.java |  12 +-
 .../ModelicaSourceViewerConfiguration.java    | 130 ++++---
 .../ui/properties/ConfigurationTab.java       |  12 +-
 .../sysdyn/ui/properties/EnumerationTab.java  |   4 +-
 .../sysdyn/ui/properties/EquationTab.java     |   4 +-
 .../ui/properties/FunctionLibraryTab.java     |   2 +
 .../sysdyn/ui/properties/FunctionTab.java     |   2 +
 .../ui/properties/InputVariableTab.java       |   4 +-
 .../sysdyn/ui/properties/ModuleTab.java       |   2 +
 .../sysdyn/ui/properties/ModuleTypeTab.java   |   2 +
 .../widgets/arrays/EnumerationIndexNode.java  |   4 +-
 .../NameAndArrayRangeModifyListener.java      |  12 +-
 .../ExpressionFieldConfiguration.java         |   4 +-
 .../widgets/expressions/Function.java         |  30 +-
 .../FunctionLibraryNameInputValidator.java    |  52 +++
 .../factories/FunctionNameInputValidator.java |  52 +++
 .../factories/ModelNameInputValidator.java    |  52 +++
 .../ModuleTypeNameInputValidator.java         |  52 +++
 ...r.java => VariableNameInputValidator.java} |  40 +--
 .../VariableNamePropertyModifier.java         |   4 +-
 .../utils/FunctionLibraryNameValidator.java   |  74 ++++
 .../ui/utils/FunctionNameValidator.java       |  70 ++++
 .../sysdyn/ui/utils/ModelNameValidator.java   |  56 +++
 .../ui/utils/ModuleTypeNameValidator.java     |  84 +++++
 .../sysdyn/ui/utils/NameValidator.java        | 335 ++++++++++++++++++
 .../SharedFunctionLibraryNameValidator.java   |  70 ++++
 .../sysdyn/ui/utils/SheetNameValidator.java   |  70 ++++
 .../sysdyn/ui/utils/VariableNameUtils.java    | 289 ---------------
 .../ui/utils/VariableNameValidator.java       | 219 ++++++++++++
 .../sysdyn/representation/Model.java          |  24 ++
 41 files changed, 1470 insertions(+), 450 deletions(-)
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionLibraryNameInputValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionNameInputValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModelNameInputValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModuleTypeNameInputValidator.java
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/{VariableNameValidator.java => VariableNameInputValidator.java} (58%)
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionLibraryNameValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionNameValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModelNameValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModuleTypeNameValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/NameValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SharedFunctionLibraryNameValidator.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SheetNameValidator.java
 delete mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameUtils.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameValidator.java

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index c5c6a38c..d3a9e321 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -1418,6 +1418,14 @@
                         args="org.simantics.sysdyn.ui.browser.nodes.FunctionLibraryNode"
                         property="org.simantics.sysdyn.ui.nodeClass">
                   </test>
+                  <test
+                        args="org.simantics.sysdyn.ui.browser.nodes.SheetNode"
+                        property="org.simantics.sysdyn.ui.nodeClass">
+                  </test>
+                  <test
+                        args="org.simantics.sysdyn.ui.browser.nodes.BarChartNode"
+                        property="org.simantics.sysdyn.ui.nodeClass">
+                  </test>
                   <!--
                   <test
                         args="org.simantics.document.workbench.browser_old.DocumentationNode"
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java
index beaf98a3..cc3283ef 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/EnumerationNode.java
@@ -16,7 +16,7 @@ import org.simantics.sysdyn.SysdynResource;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.ui.ExceptionUtils;
 
-public class EnumerationNode extends VariableNode<Resource> implements IDeletableNode {
+public class EnumerationNode extends VariableNode<Resource> implements /*IModifiableNode,*/ IDeletableNode {
 
 	public EnumerationNode(Resource resource) {
 		super(resource);
@@ -25,6 +25,22 @@ public class EnumerationNode extends VariableNode<Resource> implements IDeletabl
 	public EnumerationNode(Variable variable, Resource represents) {
         super(variable, represents);
 	}
+    /*
+    @Override
+    public Modifier getModifier(String columnId) {
+        
+        Session session = SimanticsUI.getSession();
+        LabelModifier modifier = new LabelModifier(session, data, session.getService(Layer0.class).HasName) {
+            @Override
+            public String isValid(String label) {
+                if (!new VariableNameValidator().isValid(data, label))
+                    return "Not valid";
+                else
+                    return null;
+            }
+        };
+        return modifier;
+    }*/
 
 	@Override
 	public void delete() throws DeleteException {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionLibraryNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionLibraryNode.java
index 52ded002..00a3dcb5 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionLibraryNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionLibraryNode.java
@@ -25,6 +25,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.util.RemoverUtil;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.ui.utils.FunctionLibraryNameValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.utils.ResourceAdaptionUtils;
 
@@ -41,13 +42,12 @@ public class FunctionLibraryNode<T> extends AbstractNode<Resource> implements ID
 			Resource hasName = Layer0.getInstance(SimanticsUI.getSession()).HasName;
 			LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data, hasName) {
 				@Override
-				public String isValid(String label) {
-					if (label.isEmpty())
-						return "Empty label not allowed";
-					if (label.contains(" "))
-						return "Spaces are not allowed";
-					return null;
-				}
+	            public String isValid(String label) {
+	                if (!new FunctionLibraryNameValidator().isValid(data, label))
+	                    return "Not valid";
+	                else
+	                    return null;
+	            }
 			};
 			return modifier;
 		} catch (DatabaseException e) {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionNode.java
index c3900b25..21312513 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/FunctionNode.java
@@ -24,6 +24,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.util.RemoverUtil;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.ui.utils.FunctionNameValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.utils.ResourceAdaptionUtils;
 
@@ -38,14 +39,13 @@ public class FunctionNode extends VariableNode<Resource> implements IDeletableNo
 		try {
 			Resource hasName = Layer0.getInstance(SimanticsUI.getSession()).HasName;
 			LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data, hasName) {
-				@Override
-				public String isValid(String label) {
-					if (label.isEmpty())
-						return "Empty label not allowed";
-					if (label.contains(" "))
-						return "Spaces are not allowed";
-					return null;
-				}
+                @Override
+                public String isValid(String label) {
+                    if (!new FunctionNameValidator().isValid(data, label))
+                        return "Not valid";
+                    else
+                        return null;
+                }
 			};
 			return modifier;
 		} catch (DatabaseException e) {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java
index 2652d552..eb7229b1 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java
@@ -32,6 +32,7 @@ import org.simantics.db.request.Write;
 import org.simantics.layer0.Layer0;
 import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.ui.utils.ModelNameValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.ui.ExceptionUtils;
 
@@ -86,11 +87,10 @@ public class ModelNode extends AbstractNode<Resource> implements IDoubleClickabl
         LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data) {
             @Override
             public String isValid(String label) {
-                if (label.isEmpty())
-                    return "Empty label not allowed";
-                if (label.contains(" "))
-                    return "Spaces are not allowed";
-                return null;
+                if (!new ModelNameValidator().isValid(data, label))
+                    return "Not valid";
+                else
+                    return null;
             }
             
             @Override
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java
index 0f2dc7c5..2c947be3 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleNode.java
@@ -22,7 +22,7 @@ import org.simantics.layer0.Layer0;
 import org.simantics.structural.stubs.StructuralResource2;
 import org.simantics.ui.SimanticsUI;
 
-public class ModuleNode extends ConfigurationNode<Resource> {
+public class ModuleNode extends ConfigurationNode<Resource>/* implements IModifiableNode*/ {
 
 	Resource configuration;
 	
@@ -60,4 +60,24 @@ public class ModuleNode extends ConfigurationNode<Resource> {
             return new DefaultPasteHandler(configuration);
         return super.getAdapter(adapter);
     }
+
+    /*@Override
+    public Modifier getModifier(String columnId) {
+        try {
+            Resource hasName = Layer0.getInstance(SimanticsUI.getSession()).HasName;
+            LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data, hasName) {
+                @Override
+                public String isValid(String label) {
+                    if (!new VariableNameValidator().isValid(data, label))
+                        return "Not valid";
+                    else
+                        return null;
+                }
+            };
+            return modifier;
+        } catch (DatabaseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }*/
 }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleTypeNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleTypeNode.java
index a10c7c1f..22e62b2f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleTypeNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModuleTypeNode.java
@@ -42,6 +42,7 @@ import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
 import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.structural.stubs.StructuralResource2;
+import org.simantics.sysdyn.ui.utils.ModuleTypeNameValidator;
 import org.simantics.ui.SimanticsUI;
 
 public class ModuleTypeNode extends AbstractNode<Resource> implements IDeletableNode, IModifiableNode {
@@ -123,9 +124,10 @@ public class ModuleTypeNode extends AbstractNode<Resource> implements IDeletable
                     LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), type, l0.HasName) {
                         @Override
                         public String isValid(String label) {
-                            if (label.isEmpty())
-                                return "Empty name not allowed";
-                            return null;
+                            if (!new ModuleTypeNameValidator().isValid(data, label))
+                                return "Not valid";
+                            else
+                                return null;
                         }
                     };
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SharedFunctionLibraryNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SharedFunctionLibraryNode.java
index e003f140..e2269eba 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SharedFunctionLibraryNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SharedFunctionLibraryNode.java
@@ -13,12 +13,15 @@ package org.simantics.sysdyn.ui.browser.nodes;
 
 import org.simantics.browsing.ui.common.node.DeleteException;
 import org.simantics.browsing.ui.common.node.IDropTargetNode;
+import org.simantics.browsing.ui.content.Labeler.Modifier;
+import org.simantics.browsing.ui.graph.impl.LabelModifier;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.ui.utils.SharedFunctionLibraryNameValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.utils.ResourceAdaptionUtils;
 
@@ -43,6 +46,26 @@ public class SharedFunctionLibraryNode extends FunctionLibraryNode<Resource> imp
 			}
 		});
 	}
+
+    @Override
+    public Modifier getModifier(String columnId) {
+        try {
+            Resource hasName = Layer0.getInstance(SimanticsUI.getSession()).HasName;
+            LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data, hasName) {
+                @Override
+                public String isValid(String label) {
+                    if (!new SharedFunctionLibraryNameValidator().isValid(data, label))
+                        return "Not valid";
+                    else
+                        return null;
+                }
+            };
+            return modifier;
+        } catch (DatabaseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 	
 	@Override
 	public void drop(Object data) {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SheetNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SheetNode.java
index 8df2d43d..5ed9c243 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SheetNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/SheetNode.java
@@ -15,6 +15,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.Variables;
 import org.simantics.layer0.Layer0;
+import org.simantics.sysdyn.ui.utils.SheetNameValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.workbench.ResourceEditorInput2;
 import org.simantics.utils.ui.workbench.WorkbenchUtils;
@@ -32,9 +33,10 @@ public class SheetNode extends AbstractNode<Resource> implements IModifiableNode
         LabelModifier modifier = new LabelModifier(session, data, session.getService(Layer0.class).HasName) {
             @Override
             public String isValid(String label) {
-                if (label.isEmpty())
-                    return "Empty label not allowed";
-                return null;
+                if (!new SheetNameValidator().isValid(data, label))
+                    return "Not valid";
+                else
+                    return null;
             }
         };
         return modifier;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java
index cada925b..71973d34 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/VariableNode.java
@@ -15,7 +15,7 @@ import org.simantics.browsing.ui.common.node.AbstractNode;
 import org.simantics.db.Resource;
 import org.simantics.db.layer0.variable.Variable;
 
-public class VariableNode<T> extends AbstractNode<Resource> {
+public class VariableNode<T> extends AbstractNode<Resource>/* implements IModifiableNode*/ {
 
 	Variable variable;
 
@@ -31,4 +31,24 @@ public class VariableNode<T> extends AbstractNode<Resource> {
 	public Variable getVariable() {
 		return variable;
 	}
+
+    /*@Override
+    public Modifier getModifier(String columnId) {
+        try {
+            Resource hasName = Layer0.getInstance(SimanticsUI.getSession()).HasName;
+            LabelModifier modifier = new LabelModifier(SimanticsUI.getSession(), data, hasName) {
+                @Override
+                public String isValid(String label) {
+                    if (!new VariableNameValidator().isValid(data, label))
+                        return "Not valid";
+                    else
+                        return null;
+                }
+            };
+            return modifier;
+        } catch (DatabaseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }*/
 }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java
index df0ed021..319a4baa 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynCopyPasteStrategy.java
@@ -28,7 +28,7 @@ import org.simantics.diagram.handler.PasteOperation;
 import org.simantics.diagram.handler.Paster;
 import org.simantics.diagram.handler.Paster.NodeMap;
 import org.simantics.modeling.ModelingResources;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 import org.simantics.utils.ui.ErrorLogger;
 
 /**
@@ -97,7 +97,7 @@ public class SysdynCopyPasteStrategy extends DefaultCopyPasteStrategy {
                     // Check for each name individually
                     for(String originalName : names.keySet()) {
                         String newName = names.get(originalName);
-                        VariableNameUtils.renameInEquations(graph, copy, originalName, newName);
+                        new VariableNameValidator().renameInEquations(graph, copy, originalName, newName);
                     }
                 }
             }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementNoBounds.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementNoBounds.java
index a5528063..b623b9d7 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementNoBounds.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementNoBounds.java
@@ -34,7 +34,7 @@ import org.simantics.g2d.utils.Alignment;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
 import org.simantics.scenegraph.g2d.G2DParentNode;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
@@ -102,7 +102,7 @@ public class HoverTextElementNoBounds extends TextElementNoBounds implements Lif
 					@Override
 					public void textChanged() {
 						TextNode node = (TextNode) e.getHint(SG_NODE);
-						if(!VariableNameUtils.isValid(component, node.getText(), false)) {
+						if(!new VariableNameValidator().isValid(component, node.getText(), false)) {
 							node.setColor(Color.RED);
 						} else {
 							node.setColor(ElementUtils.getTextColor(e, Color.BLACK));
@@ -135,7 +135,7 @@ public class HoverTextElementNoBounds extends TextElementNoBounds implements Lif
 					public void textEditingCancelled() {
 						TextNode node = (TextNode) e.getHint(SG_NODE);
 						if (node != null) {
-							if(VariableNameUtils.isValid(component, node.getText(), false))
+							if(new VariableNameValidator().isValid(component, node.getText(), false))
 								node.setColor(ElementUtils.getTextColor(e, Color.BLACK));
 							endEdit(node);
 						}
@@ -147,10 +147,10 @@ public class HoverTextElementNoBounds extends TextElementNoBounds implements Lif
 						if (node == null)
 							return;
 						String text = node.getText();
-						if(!VariableNameUtils.isValid(component, text, false)) {
+						if(!new VariableNameValidator().isValid(component, text, false)) {
 							text = textBeforeEdit;
 							node.setText(text);
-							if(VariableNameUtils.isValid(component, text, false))
+							if(new VariableNameValidator().isValid(component, text, false))
 								node.setColor(ElementUtils.getTextColor(e, Color.BLACK));
 						} else {
 							Object o = e.getHint(ElementHints.KEY_OBJECT);
@@ -160,7 +160,7 @@ public class HoverTextElementNoBounds extends TextElementNoBounds implements Lif
 								    @Override
 								    public void perform(WriteGraph graph) throws DatabaseException {
 								        Resource configuration = graph.getPossibleObject(component, Layer0.getInstance(graph).PartOf);
-								        VariableNameUtils.renameInAllEquations(graph, configuration, textBeforeEdit, textAfterEdit);
+								        new VariableNameValidator().renameInAllEquations(graph, configuration, textBeforeEdit, textAfterEdit);
 								    }
 								});
 							}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java
index dfc4fd80..84c0055f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java
@@ -31,7 +31,8 @@ import org.eclipse.swt.graphics.Color;
 
 public class ModelicaSourceViewerConfiguration extends SourceViewerConfiguration {
 
-	public IPresentationReconciler getPresentationReconciler(
+	@Override
+    public IPresentationReconciler getPresentationReconciler(
 			ISourceViewer sourceViewer) {
 		PresentationReconciler pr = new PresentationReconciler();
 		DefaultDamagerRepairer ddr = new DefaultDamagerRepairer(
@@ -80,62 +81,77 @@ public class ModelicaSourceViewerConfiguration extends SourceViewerConfiguration
 		 || (c >= '0' && c <= '9') || c == '_';
 	}
 	
-	static final Set<String> keywords = new HashSet<String>();
-	
-	static {
-		keywords.add("within");
-		keywords.add("final");
-		keywords.add("public");
-		keywords.add("protected");
-		keywords.add("connect");
-		keywords.add("when");
-		keywords.add("then");
-		keywords.add("elsewhen");
-		keywords.add("if");
-		keywords.add("end");
-		keywords.add("elseif");
-		keywords.add("else");
-		keywords.add("for");
-		keywords.add("while");
-		keywords.add("loop");
-		keywords.add("der");
-		keywords.add("enumeration");
-		keywords.add("extends");
-		keywords.add("class");
-		keywords.add("partial");
-		keywords.add("encapsulated");
-		keywords.add("model");
-		keywords.add("record");
-		keywords.add("block");
-		keywords.add("expandable");
-		keywords.add("connector");
-		keywords.add("type");
-		keywords.add("package");
-		keywords.add("function");
-		keywords.add("import");
-		keywords.add("external");
-		keywords.add("constrainedby");
-		keywords.add("redeclare");
-		keywords.add("replaceable");
-		keywords.add("flow");
-		keywords.add("discrete");
-		keywords.add("parameter");
-		keywords.add("constant");
-		keywords.add("input");
-		keywords.add("output");
-		keywords.add("annotation");
-		keywords.add("false");
-		keywords.add("true");
-		keywords.add("each");
-		keywords.add("initial");
-		keywords.add("algorithm");
-		keywords.add("equation");
-		keywords.add("or");
-		keywords.add("and");
-		keywords.add("not");
-		keywords.add("break");
-		keywords.add("return");		
-	}
+	// Includes also tokens that are strictly speaking not keywords
+	// but should be handled in (almost) a similar fashion.
+	public static final Set<String> keywords = new HashSet<String>();
+
+    static {
+        keywords.add("algorithm");
+        keywords.add("discrete");
+        keywords.add("false");
+        keywords.add("model");
+        keywords.add("redeclare");
+        keywords.add("and");
+        keywords.add("each");
+        keywords.add("final");
+        keywords.add("not");
+        keywords.add("replaceable");
+        keywords.add("annotation");
+        keywords.add("else");
+        keywords.add("flow");
+        keywords.add("operator");
+        keywords.add("return");
+        keywords.add("assert");
+        keywords.add("elseif");
+        keywords.add("for");
+        keywords.add("or");
+        keywords.add("stream");
+        keywords.add("block");
+        keywords.add("elsewhen");
+        keywords.add("function");
+        keywords.add("outer");
+        keywords.add("then");
+        keywords.add("break");
+        keywords.add("encapsulated");
+        keywords.add("if");
+        keywords.add("output");
+        keywords.add("true");
+        keywords.add("class");
+        keywords.add("end");
+        keywords.add("import");
+        keywords.add("package");
+        keywords.add("type");
+        keywords.add("connect");
+        keywords.add("enumeration");
+        keywords.add("in");
+        keywords.add("parameter");
+        keywords.add("when");
+        keywords.add("connector");
+        keywords.add("equation");
+        keywords.add("initial");
+        keywords.add("partial");
+        keywords.add("while");
+        keywords.add("constant");
+        keywords.add("expandable");
+        keywords.add("inner");
+        keywords.add("protected");
+        keywords.add("within");
+        keywords.add("constrainedby");
+        keywords.add("extends");
+        keywords.add("input");
+        keywords.add("public");
+        keywords.add("der");
+        keywords.add("external");
+        keywords.add("loop");
+        keywords.add("record");
+        keywords.add("time");
+        keywords.add("pure");
+        keywords.add("impure");
+        keywords.add("Real");
+        keywords.add("Boolean");
+        keywords.add("Integer");
+        keywords.add("String");
+    }
 
 	static IToken modelicaKeywordToken = null;
 	public IToken getModelicaKeywordToken() {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ConfigurationTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ConfigurationTab.java
index 96dea950..540eda46 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ConfigurationTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ConfigurationTab.java
@@ -40,7 +40,7 @@ import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.ui.properties.widgets.factories.ComboStringPropertyModifier;
 import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyFactory;
 import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyModifier;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.properties.widgets.factories.ModelNameInputValidator;
 
 /**
  * Tab displaying configuration properties. Displayed for model and configuration.
@@ -87,15 +87,7 @@ public class ConfigurationTab extends LabelPropertyTabContributor {
         TrackedText name = new TrackedText(composite, support, SWT.BORDER);
         name.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasLabel));
         name.addModifyListener(new ModelLabelModifier(context, Layer0.URIs.HasLabel));
-        name.setInputValidator(new IInputValidator() {
-            
-            @Override
-            public String isValid(String newText) {
-                if (!VariableNameUtils.isValid(newText))
-                    return "Sorry but spaces and special characters are not allowed for names right now";
-                return null;
-            }
-        });
+        name.setInputValidator(new ModelNameInputValidator(support));
 
         GridDataFactory.fillDefaults().hint(200, SWT.DEFAULT).applyTo(name.getWidget());
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java
index cddbd10a..265325a2 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EnumerationTab.java
@@ -60,7 +60,7 @@ import org.simantics.sysdyn.manager.SysdynModelManager;
 import org.simantics.sysdyn.ui.properties.widgets.arrays.EnumerationIndexNode;
 import org.simantics.sysdyn.ui.properties.widgets.arrays.ReplaceableIndexesWidget;
 import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNamePropertyModifier;
-import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNameValidator;
+import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNameInputValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.datastructures.ArrayMap;
 import org.simantics.utils.ui.AdaptionUtils;
@@ -86,7 +86,7 @@ public class EnumerationTab extends LabelPropertyTabContributor implements Widge
         TrackedText nameText = new TrackedText(container, support, SWT.BORDER);
         nameText.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasName));
         nameText.addModifyListener(new VariableNamePropertyModifier(context, Layer0.URIs.HasName));
-        nameText.setInputValidator(new VariableNameValidator(support));
+        nameText.setInputValidator(new VariableNameInputValidator(support));
         GridDataFactory.fillDefaults().grab(true, false).span(4,1).applyTo(nameText.getWidget());
         
         indexExplorer = new GraphExplorerComposite(ArrayMap.keys(
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EquationTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EquationTab.java
index bed25ff2..eab753cb 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EquationTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/EquationTab.java
@@ -73,7 +73,7 @@ import org.simantics.sysdyn.ui.properties.widgets.ShortcutTabWidget;
 import org.simantics.sysdyn.ui.properties.widgets.arrays.NameAndArrayRangeModifyListener;
 import org.simantics.sysdyn.ui.properties.widgets.expressions.ExpressionComposite;
 import org.simantics.sysdyn.ui.properties.widgets.expressions.ExpressionWidgetInput;
-import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNameValidator;
+import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNameInputValidator;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.ui.AdaptionUtils;
@@ -140,7 +140,7 @@ public class EquationTab extends LabelPropertyTabContributor implements Widget {
 		GridDataFactory.fillDefaults().grab(true, false).applyTo(nameComposite);
 
 		arrayEquationCombo =  new ArrayExpressionCombo(nameComposite, support, SWT.DROP_DOWN | SWT.BORDER);
-		arrayEquationCombo.setInputValidator(new VariableNameValidator(support));
+		arrayEquationCombo.setInputValidator(new VariableNameInputValidator(support));
 		GridDataFactory.fillDefaults().grab(true, false).applyTo(arrayEquationCombo.getWidget());
 		
 		deleteExpression = new Button(nameComposite, support, SWT.NONE);
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionLibraryTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionLibraryTab.java
index b198c15d..5164aa97 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionLibraryTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionLibraryTab.java
@@ -22,6 +22,7 @@ import org.simantics.browsing.ui.swt.widgets.TrackedText;
 import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;
 import org.simantics.db.management.ISessionContext;
 import org.simantics.layer0.Layer0;
+import org.simantics.sysdyn.ui.properties.widgets.factories.FunctionLibraryNameInputValidator;
 
 public class FunctionLibraryTab extends LabelPropertyTabContributor {
 
@@ -36,6 +37,7 @@ public class FunctionLibraryTab extends LabelPropertyTabContributor {
 		TrackedText nameText = new TrackedText(composite, support, SWT.BORDER);
 		nameText.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasName));
 		nameText.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasName));
+        nameText.setInputValidator(new FunctionLibraryNameInputValidator(support));
 		GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText.getWidget());
 
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionTab.java
index 2817708f..d7c57f34 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/FunctionTab.java
@@ -26,6 +26,7 @@ import org.simantics.db.management.ISessionContext;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.ui.properties.widgets.FunctionLabelFactory;
 import org.simantics.sysdyn.ui.properties.widgets.expressions.ExpressionField;
+import org.simantics.sysdyn.ui.properties.widgets.factories.FunctionNameInputValidator;
 import org.simantics.sysdyn.ui.properties.widgets.functions.FunctionCodeWidget;
 
 public class FunctionTab extends LabelPropertyTabContributor {
@@ -43,6 +44,7 @@ public class FunctionTab extends LabelPropertyTabContributor {
         TrackedText nameText = new TrackedText(composite, support, SWT.BORDER);
         nameText.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasName));
         nameText.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasName));
+        nameText.setInputValidator(new FunctionNameInputValidator(support));
         GridDataFactory.fillDefaults().span(2, 1).grab(true, false).applyTo(nameText.getWidget());
         
         
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/InputVariableTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/InputVariableTab.java
index e55f2acd..9578e18b 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/InputVariableTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/InputVariableTab.java
@@ -38,7 +38,7 @@ import org.simantics.sysdyn.ui.properties.widgets.IsOutputWidget;
 import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyFactory;
 import org.simantics.sysdyn.ui.properties.widgets.factories.DoublePropertyModifier;
 import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNamePropertyModifier;
-import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNameValidator;
+import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNameInputValidator;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.ui.validators.DoubleValidator;
 
@@ -60,7 +60,7 @@ public class InputVariableTab  extends LabelPropertyTabContributor {
         TrackedText nameText = new TrackedText(composite, support, SWT.BORDER);
         nameText.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasName));
         nameText.addModifyListener(new VariableNamePropertyModifier(context, Layer0.URIs.HasName));
-        nameText.setInputValidator(new VariableNameValidator(support));
+        nameText.setInputValidator(new VariableNameInputValidator(support));
         GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText.getWidget());
 
         Composite defaultValueComposite = new Composite(composite, SWT.NONE);
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java
index 34f5ac22..030746cc 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTab.java
@@ -31,6 +31,7 @@ import org.simantics.db.management.ISessionContext;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.ui.properties.widgets.ColumnKeys;
+import org.simantics.sysdyn.ui.properties.widgets.factories.VariableNameInputValidator;
 import org.simantics.utils.datastructures.ArrayMap;
 
 public class ModuleTab extends LabelPropertyTabContributor implements Widget {
@@ -47,6 +48,7 @@ public class ModuleTab extends LabelPropertyTabContributor implements Widget {
         TrackedText nameText = new TrackedText(composite, support, SWT.BORDER);
         nameText.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasName));
         nameText.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasName));
+        nameText.setInputValidator(new VariableNameInputValidator(support));
         GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText.getWidget());
         
         Label label = new Label(composite, SWT.NONE);
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTypeTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTypeTab.java
index fe40aee7..79ebe9ab 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTypeTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ModuleTypeTab.java
@@ -22,6 +22,7 @@ import org.simantics.browsing.ui.swt.widgets.TrackedText;
 import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;
 import org.simantics.db.management.ISessionContext;
 import org.simantics.layer0.Layer0;
+import org.simantics.sysdyn.ui.properties.widgets.factories.ModuleTypeNameInputValidator;
 
 public class ModuleTypeTab extends LabelPropertyTabContributor {
 
@@ -33,6 +34,7 @@ public class ModuleTypeTab extends LabelPropertyTabContributor {
         TrackedText nameText = new TrackedText(composite, support, SWT.BORDER);
         nameText.setTextFactory(new StringPropertyFactory(Layer0.URIs.HasName));
         nameText.addModifyListener(new StringPropertyModifier(context, Layer0.URIs.HasName));
+        nameText.setInputValidator(new ModuleTypeNameInputValidator(support));
         GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText.getWidget());
     }
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/EnumerationIndexNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/EnumerationIndexNode.java
index e5aaef7e..45f1e1a1 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/EnumerationIndexNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/EnumerationIndexNode.java
@@ -12,7 +12,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.request.Read;
 import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 import org.simantics.ui.SimanticsUI;
 
 public class EnumerationIndexNode  extends AbstractNode<Resource> implements IModifiableNode, IDoubleClickableNode {
@@ -47,7 +47,7 @@ public class EnumerationIndexNode  extends AbstractNode<Resource> implements IMo
 
             @Override
             public String isValid(String label) {
-            	if(!VariableNameUtils.isValid(label))
+            	if(!new VariableNameValidator().isValidModelica(label))
             		return "Not valid";
                 return null;
             }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/NameAndArrayRangeModifyListener.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/NameAndArrayRangeModifyListener.java
index af72b798..90b4319c 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/NameAndArrayRangeModifyListener.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/arrays/NameAndArrayRangeModifyListener.java
@@ -3,7 +3,6 @@ package org.simantics.sysdyn.ui.properties.widgets.arrays;
 import java.util.LinkedHashMap;
 import java.util.StringTokenizer;
 
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Combo;
 import org.simantics.Simantics;
 import org.simantics.browsing.ui.swt.widgets.impl.ComboModifyListenerImpl;
@@ -24,7 +23,7 @@ import org.simantics.layer0.Layer0;
 import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.ui.properties.widgets.ArrayExpressionCombo;
 import org.simantics.sysdyn.ui.properties.widgets.ExpressionWidget;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 import org.simantics.utils.ui.ISelectionUtils;
 
 /**
@@ -51,7 +50,8 @@ public class NameAndArrayRangeModifyListener extends ComboModifyListenerImpl<Res
 		this.lastInput = input;
 	} 
 		
-	public void modifyText(TrackedModifyEvent e) {		
+	@Override
+    public void modifyText(TrackedModifyEvent e) {		
 		Combo combo = (Combo)e.getWidget();
 		LinkedHashMap<?, ?> data = (LinkedHashMap<?, ?>) combo.getData();
 		
@@ -62,7 +62,7 @@ public class NameAndArrayRangeModifyListener extends ComboModifyListenerImpl<Res
 				@Override
 				public Resource perform(ReadGraph graph)
 						throws DatabaseException {
-					Resource variable = ISelectionUtils.filterSingleSelection((ISelection)input, Resource.class);
+					Resource variable = ISelectionUtils.filterSingleSelection(input, Resource.class);
 					return graph.getPossibleObject(variable, SysdynResource.getInstance(graph).IndependentVariable_activeExpression);
 				}
 				
@@ -80,7 +80,7 @@ public class NameAndArrayRangeModifyListener extends ComboModifyListenerImpl<Res
 			for(Object key : data.keySet()) {
 				int index = arrayExpressionCombo.getLastSelectedIndex() < 0 ? 0 : arrayExpressionCombo.getLastSelectedIndex();
 				if((Integer)combo.getData((String)key) == index) {
-					lastExpression =  (Resource) data.get((String)key);
+					lastExpression =  (Resource) data.get(key);
 					break;
 				}
 			}
@@ -106,7 +106,7 @@ public class NameAndArrayRangeModifyListener extends ComboModifyListenerImpl<Res
 		String originalName = graph.getRelatedValue(variable, Layer0.getInstance(graph).HasName);
 		if(!originalName.equals(newName)) {
 		    Resource configuration = graph.getPossibleObject(variable, Layer0.getInstance(graph).PartOf);
-			VariableNameUtils.renameInAllEquations(graph, configuration, originalName, newName);
+		    new VariableNameValidator().renameInAllEquations(graph, configuration, originalName, newName);
 			graph.claimLiteral(variable, Layer0.getInstance(graph).HasName, newName);
 		}
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/ExpressionFieldConfiguration.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/ExpressionFieldConfiguration.java
index 46e75fca..d2f646ba 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/ExpressionFieldConfiguration.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/ExpressionFieldConfiguration.java
@@ -43,7 +43,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.modelica.ModelicaSourceViewerConfiguration;
 
 @SuppressWarnings("restriction")
 public class ExpressionFieldConfiguration extends SourceViewerConfiguration {
@@ -119,7 +119,7 @@ public class ExpressionFieldConfiguration extends SourceViewerConfiguration {
 		}, defaultToken);
 		
 
-		for(String s : VariableNameUtils.keywords) {
+		for(String s : ModelicaSourceViewerConfiguration.keywords) {
 			reservedWord.addWord(s, reserved);
 		}
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/Function.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/Function.java
index 5817d1fe..6ddacd64 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/Function.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/Function.java
@@ -198,6 +198,23 @@ public class Function implements Comparable<Function>{
         return functions;
     }
     
+    /**
+     * Get all built-in Modelica functions.
+     * Should be used if called inside a transaction
+     * @return ArrayList containing all built-in functions.
+     */
+    public static ArrayList<Function> getAllBuiltInFunctions(ReadGraph graph) throws DatabaseException {
+        ArrayList<Function> functions = new ArrayList<Function>();
+    
+        // Add different types of functions.
+        functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions, Type.SYSDYN));
+        functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions_Vensim_Functions, Type.VENSIM));
+        functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions_Modelica_Functions, Type.MODELICA));
+        functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions_Modelica_Array_Functions, Type.MODELICA_ARRAY));
+        
+        return functions;
+    }
+    
     /**
      * Get all built-in Modelica functions.
      * @return ArrayList containing all built-in functions.
@@ -209,17 +226,8 @@ public class Function implements Comparable<Function>{
         try {
              result = SimanticsUI.getSession().syncRequest(new Read<ArrayList<Function>>() {
                 @Override
-                public ArrayList<Function> perform(ReadGraph graph)
-                        throws DatabaseException {
-                    ArrayList<Function> functions = new ArrayList<Function>();
-
-                    // Add different types of functions.
-                    functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions, Type.SYSDYN));
-                    functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions_Vensim_Functions, Type.VENSIM));
-                    functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions_Modelica_Functions, Type.MODELICA));
-                    functions.addAll(getFunctionsOfType(graph, SysdynResource.URIs.Built$in_Functions_Modelica_Array_Functions, Type.MODELICA_ARRAY));
-                    
-                    return functions;
+                public ArrayList<Function> perform(ReadGraph graph) throws DatabaseException {
+                    return getAllBuiltInFunctions(graph);
                 }
             });
         }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionLibraryNameInputValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionLibraryNameInputValidator.java
new file mode 100644
index 00000000..18c1a414
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionLibraryNameInputValidator.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.properties.widgets.factories;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.simantics.browsing.ui.swt.widgets.impl.Widget;
+import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;
+import org.simantics.db.Resource;
+import org.simantics.db.management.ISessionContext;
+import org.simantics.sysdyn.ui.utils.FunctionLibraryNameValidator;
+import org.simantics.utils.ui.ISelectionUtils;
+
+/**
+ * Name validator container for user defined function libraries.
+ * @author Tuomas Miettinen
+ *
+ */
+public class FunctionLibraryNameInputValidator implements IInputValidator, Widget {
+
+    private Resource lastInput = null;
+    
+    public FunctionLibraryNameInputValidator(WidgetSupport support) {
+        support.register(this);
+    }
+    
+    /**
+     * Checks that the syntax of the given name is valid and there 
+     * are no other components that have the same name in the configuration.
+     */
+    @Override
+    public String isValid(final String newText) {
+        if (!new FunctionLibraryNameValidator().isValid(lastInput, newText))
+            return "Not valid";
+        else
+            return null;
+    }
+
+    @Override
+    public void setInput(ISessionContext context, Object input) {
+        lastInput = ISelectionUtils.filterSingleSelection(input, Resource.class);
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionNameInputValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionNameInputValidator.java
new file mode 100644
index 00000000..a5cce2b3
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/FunctionNameInputValidator.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.properties.widgets.factories;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.simantics.browsing.ui.swt.widgets.impl.Widget;
+import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;
+import org.simantics.db.Resource;
+import org.simantics.db.management.ISessionContext;
+import org.simantics.sysdyn.ui.utils.FunctionNameValidator;
+import org.simantics.utils.ui.ISelectionUtils;
+
+/**
+ * Name validator container for user defined functions.
+ * @author Tuomas Miettinen
+ *
+ */
+public class FunctionNameInputValidator implements IInputValidator, Widget {
+
+    private Resource lastInput = null;
+    
+    public FunctionNameInputValidator(WidgetSupport support) {
+        support.register(this);
+    }
+    
+    /**
+     * Checks that the syntax of the given name is valid and there 
+     * are no other components that have the same name in the configuration.
+     */
+    @Override
+    public String isValid(final String newText) {
+        if (!new FunctionNameValidator().isValid(lastInput, newText))
+            return "Not valid";
+        else
+            return null;
+    }
+
+    @Override
+    public void setInput(ISessionContext context, Object input) {
+        lastInput = ISelectionUtils.filterSingleSelection(input, Resource.class);
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModelNameInputValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModelNameInputValidator.java
new file mode 100644
index 00000000..625e9559
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModelNameInputValidator.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.properties.widgets.factories;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.simantics.browsing.ui.swt.widgets.impl.Widget;
+import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;
+import org.simantics.db.Resource;
+import org.simantics.db.management.ISessionContext;
+import org.simantics.sysdyn.ui.utils.ModelNameValidator;
+import org.simantics.utils.ui.ISelectionUtils;
+
+/**
+ * Name validator container for model.
+ * @author Tuomas Miettinen
+ *
+ */
+public class ModelNameInputValidator implements IInputValidator, Widget {
+
+    private Resource lastInput = null;
+    
+    public ModelNameInputValidator(WidgetSupport support) {
+        support.register(this);
+    }
+    
+    /**
+     * Checks that the syntax of the given name is valid and there 
+     * are no other components that have the same name in the configuration.
+     */
+    @Override
+    public String isValid(final String newText) {
+        if (!new ModelNameValidator().isValid(lastInput, newText))
+            return "Not valid";
+        else
+            return null;
+    }
+
+    @Override
+    public void setInput(ISessionContext context, Object input) {
+        lastInput = ISelectionUtils.filterSingleSelection(input, Resource.class);
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModuleTypeNameInputValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModuleTypeNameInputValidator.java
new file mode 100644
index 00000000..1340525a
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/ModuleTypeNameInputValidator.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.properties.widgets.factories;
+
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.simantics.browsing.ui.swt.widgets.impl.Widget;
+import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;
+import org.simantics.db.Resource;
+import org.simantics.db.management.ISessionContext;
+import org.simantics.sysdyn.ui.utils.ModuleTypeNameValidator;
+import org.simantics.utils.ui.ISelectionUtils;
+
+/**
+ * Name validator container for module types.
+ * @author Tuomas Miettinen
+ *
+ */
+public class ModuleTypeNameInputValidator implements IInputValidator, Widget {
+
+    private Resource lastInput = null;
+    
+    public ModuleTypeNameInputValidator(WidgetSupport support) {
+        support.register(this);
+    }
+    
+    /**
+     * Checks that the syntax of the given name is valid and there 
+     * are no other components that have the same name in the configuration.
+     */
+    @Override
+    public String isValid(final String newText) {
+        if (!new ModuleTypeNameValidator().isValid(lastInput, newText))
+            return "Not valid";
+        else
+            return null;
+    }
+
+    @Override
+    public void setInput(ISessionContext context, Object input) {
+        lastInput = ISelectionUtils.filterSingleSelection(input, Resource.class);
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNameInputValidator.java
similarity index 58%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNameValidator.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNameInputValidator.java
index 9d635e71..3a6af0ce 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNameValidator.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNameInputValidator.java
@@ -12,19 +12,24 @@
 package org.simantics.sysdyn.ui.properties.widgets.factories;
 
 import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.viewers.ISelection;
 import org.simantics.browsing.ui.swt.widgets.impl.Widget;
 import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupport;
 import org.simantics.db.Resource;
 import org.simantics.db.management.ISessionContext;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 import org.simantics.utils.ui.ISelectionUtils;
 
-public class VariableNameValidator implements IInputValidator, Widget {
+/**
+ * Name validator container for module types.
+ * @author Teemu Lempinen
+ * @author Tuomas Miettinen
+ *
+ */
+public class VariableNameInputValidator implements IInputValidator, Widget {
 
 	private Resource lastInput = null;
 	
-	public VariableNameValidator(WidgetSupport support) {
+	public VariableNameInputValidator(WidgetSupport support) {
 		support.register(this);
 	}
 	
@@ -34,36 +39,15 @@ public class VariableNameValidator implements IInputValidator, Widget {
 	 */
 	@Override
 	public String isValid(final String newText) {
-        if (!VariableNameUtils.isValid(lastInput, newText, true))
-            return "Not valid";
+	    if (!new VariableNameValidator().isValid(lastInput, newText, true))
+	        return "Not valid";
         else
         	return null;
-        /*
-        if(lastInput == null) return null;
-        String result = null;
-        try {
-			result = SimanticsUI.getSession().syncRequest(new Read<String>(){
-
-				@Override
-				public String perform(ReadGraph graph) throws DatabaseException {
-					if(VariableNameUtils.nameIsTaken(graph, lastInput, newText)) {
-						return "Name is taken.";
-					}
-					return null;
-				}
-				
-			}) ;
-		} catch (DatabaseException e) {
-			e.printStackTrace();
-		}
-        return result;
-        */
-
 	}
 
 	@Override
 	public void setInput(ISessionContext context, Object input) {
-		lastInput = ISelectionUtils.filterSingleSelection((ISelection)input, Resource.class);
+		lastInput = ISelectionUtils.filterSingleSelection(input, Resource.class);
 	}
 
 }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNamePropertyModifier.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNamePropertyModifier.java
index 56d55d35..297b12b5 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNamePropertyModifier.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/factories/VariableNamePropertyModifier.java
@@ -18,7 +18,7 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.management.ISessionContext;
 import org.simantics.layer0.Layer0;
-import org.simantics.sysdyn.ui.utils.VariableNameUtils;
+import org.simantics.sysdyn.ui.utils.VariableNameValidator;
 
 public class VariableNamePropertyModifier extends TextModifyListenerImpl<Resource> {
 
@@ -40,7 +40,7 @@ public class VariableNamePropertyModifier extends TextModifyListenerImpl<Resourc
 	    Layer0 L0 = Layer0.getInstance(graph);
 		String originalName = graph.getRelatedValue(variable, L0.HasName);
         Resource configuration = graph.getPossibleObject(variable, L0.PartOf);
-        VariableNameUtils.renameInAllEquations(graph, configuration, originalName, text);
+        new VariableNameValidator().renameInAllEquations(graph, configuration, originalName, text);
 		graph.claimLiteral(variable, graph.getResource(propertyURI), text, Bindings.STRING);
 	}
 }
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionLibraryNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionLibraryNameValidator.java
new file mode 100644
index 00000000..bf67e477
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionLibraryNameValidator.java
@@ -0,0 +1,74 @@
+package org.simantics.sysdyn.ui.utils;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+import org.simantics.simulation.ontology.SimulationResource;
+import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.manager.SysdynModelManager;
+
+/**
+ * Name validator for function libraries.
+ * @author Tuomas Miettinen
+ * 
+ */
+public class FunctionLibraryNameValidator extends NameValidator {
+
+    @Override
+    protected boolean nameIsTaken(ReadGraph graph, Resource functionLibrary, String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SysdynResource sr = SysdynResource.getInstance(graph);
+        SimulationResource SIMU = SimulationResource.getInstance(graph);
+        
+        if(functionLibrary == null)
+            return false;
+        
+        Resource containingLibrary = graph.getPossibleObject(functionLibrary, l0.PartOf);
+        if(containingLibrary == null)
+            return true;
+        
+        // Check if the function is right under the model.
+        if (graph.isInstanceOf(containingLibrary, sr.SysdynModel)) {
+            Resource configurationResource = graph.getPossibleObject(containingLibrary, SIMU.HasConfiguration);
+            if(configurationResource == null)
+                return true;
+            SysdynModel sysdynModel = SysdynModelManager.getInstance(graph.getSession()).getModel(graph, configurationResource);
+            sysdynModel.update(graph);
+            
+            if (nameTakenByTopLevelVariableOrModule(graph, sysdynModel, null, name)) return true;
+            
+            // Check that the functioLibrary name != model name (== containingLibrary name)
+            if (NameUtils.getSafeName(graph, containingLibrary).equals(name)) return true;
+            
+            if (nameTakenByBuiltInFunction(graph, name)) return true;
+
+            if (nameTakenBySharedFunctionLibrary(graph, containingLibrary, null, name)) return true;
+            
+            if (nameTakenBySheet(sysdynModel, name)) return true;
+        }
+
+        // Containing library may also be the model
+        if (nameTakenByItemUnderLibrary(graph, containingLibrary, functionLibrary, name)) return true;
+
+        return false;
+    }
+
+    @Override
+    public void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionNameValidator.java
new file mode 100644
index 00000000..95b7d974
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/FunctionNameValidator.java
@@ -0,0 +1,70 @@
+package org.simantics.sysdyn.ui.utils;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+import org.simantics.simulation.ontology.SimulationResource;
+import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.manager.SysdynModelManager;
+
+/**
+ * Name validator for functions.
+ * @author Tuomas Miettinen
+ * 
+ */
+public class FunctionNameValidator extends NameValidator {
+
+    @Override
+    public void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName) throws DatabaseException {
+        // TODO
+    }
+    
+    @Override
+    public void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName) throws DatabaseException {
+        // TODO
+    }
+
+    @Override
+    protected boolean nameIsTaken(ReadGraph graph, Resource function, String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SysdynResource sr = SysdynResource.getInstance(graph);
+        SimulationResource SIMU = SimulationResource.getInstance(graph);
+        
+        if(function == null)
+            return false;
+        
+        Resource library = graph.getPossibleObject(function, l0.PartOf);
+        if(library == null)
+            return true;
+        
+        // Check if the function is right under the model.
+        if (graph.isInstanceOf(library, sr.SysdynModel)) {
+            Resource configurationResource = graph.getPossibleObject(library, SIMU.HasConfiguration);
+            if(configurationResource == null)
+                return true;
+            SysdynModel sysdynModel = SysdynModelManager.getInstance(graph.getSession()).getModel(graph, configurationResource);
+            sysdynModel.update(graph);
+            
+            if (nameTakenByTopLevelVariableOrModule(graph, sysdynModel, null, name)) return true;
+            
+            // Check that the function name != model name (== library name)
+            if (NameUtils.getSafeName(graph, library).equals(name)) return true;
+            
+            if (nameTakenByBuiltInFunction(graph, name)) return true;
+
+            if (nameTakenBySharedFunctionLibrary(graph, library, null, name)) return true;
+            
+            if (nameTakenBySheet(sysdynModel, name)) return true;
+        }
+
+        // Containing library may also be the model
+        if (nameTakenByItemUnderLibrary(graph, library, function, name)) return true;
+
+        return false;
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModelNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModelNameValidator.java
new file mode 100644
index 00000000..ec53c882
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModelNameValidator.java
@@ -0,0 +1,56 @@
+package org.simantics.sysdyn.ui.utils;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.simulation.ontology.SimulationResource;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.manager.SysdynModelManager;
+
+/**
+ * Name validator for model.
+ * @author Tuomas Miettinen
+ * 
+ */
+public class ModelNameValidator extends NameValidator {
+
+    @Override
+    protected boolean nameIsTaken(ReadGraph graph, Resource model, String name) throws DatabaseException {
+        SimulationResource SIMU = SimulationResource.getInstance(graph);
+        
+        if(model == null)
+            return false;
+
+        if (nameTakenByFunctionFunctionLibraryOrModuleType(graph, model, name)) return true;
+        
+        Resource configurationResource = graph.getPossibleObject(model, SIMU.HasConfiguration);
+        if(configurationResource == null)
+            return true;
+        SysdynModel sysdynModel = SysdynModelManager.getInstance(graph.getSession()).getModel(graph, configurationResource);
+        sysdynModel.update(graph);
+        
+        if (nameTakenByTopLevelVariableOrModule(graph, sysdynModel, null, name)) return true;
+        
+        if (nameTakenByBuiltInFunction(graph, name)) return true;
+
+        if (nameTakenBySharedFunctionLibrary(graph, model, null, name)) return true;
+
+        if (nameTakenBySheet(sysdynModel, name)) return true;
+
+        return false;
+    }
+
+    @Override
+    public void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName)
+            throws DatabaseException {
+
+    }
+
+    @Override
+    public void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName)
+            throws DatabaseException {
+
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModuleTypeNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModuleTypeNameValidator.java
new file mode 100644
index 00000000..8a3c851c
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ModuleTypeNameValidator.java
@@ -0,0 +1,84 @@
+package org.simantics.sysdyn.ui.utils;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+import org.simantics.modeling.ModelingResources;
+import org.simantics.simulation.ontology.SimulationResource;
+import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.manager.SysdynModelManager;
+
+/**
+ * Name validator for module types.
+ * @author Tuomas Miettinen
+ * 
+ */
+public class ModuleTypeNameValidator extends NameValidator {
+
+    @Override
+    protected boolean nameIsTaken(ReadGraph graph, Resource moduleTypeSymbol, String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SimulationResource SIMU = SimulationResource.getInstance(graph);
+        ModelingResources mr = ModelingResources.getInstance(graph);
+        SysdynResource sr = SysdynResource.getInstance(graph);
+        
+        if(moduleTypeSymbol == null)
+            return false;
+
+        Resource moduleType;
+        if (graph.isInheritedFrom(moduleTypeSymbol, sr.Module)) {
+            // Renamed in model browser
+            moduleType = moduleTypeSymbol;
+        } else {
+            // Renamed in ModuleTypeTab
+            moduleType = graph.getPossibleObject(moduleTypeSymbol, mr.SymbolToComponentType);
+        }
+        if(moduleType == null)
+            return true;
+        
+        // All ModuleTypes are under the top level model
+        Resource model = graph.getPossibleObject(moduleType, l0.PartOf);
+        if(model == null)
+            return true;
+
+        Resource configurationResource = graph.getPossibleObject(model, SIMU.HasConfiguration);
+        if(configurationResource == null)
+            return true;
+        SysdynModel sysdynModel = SysdynModelManager.getInstance(graph.getSession()).getModel(graph, configurationResource);
+        sysdynModel.update(graph);
+        
+        if (nameTakenByTopLevelVariableOrModule(graph, sysdynModel, null, name)) return true;
+        
+        // Check that the module name != model name
+        if (NameUtils.getSafeName(graph, model).equals(name)) return true;
+        
+        if (nameTakenByBuiltInFunction(graph, name)) return true;
+
+        if (nameTakenBySharedFunctionLibrary(graph, model, null, name)) return true;
+        
+        if (nameTakenBySheet(sysdynModel, name)) return true;
+
+        if (nameTakenByItemUnderLibrary(graph, model, moduleType, name)) return true;
+
+        return false;
+    }
+
+    @Override
+    public void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/NameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/NameValidator.java
new file mode 100644
index 00000000..b349eb55
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/NameValidator.java
@@ -0,0 +1,335 @@
+package org.simantics.sysdyn.ui.utils;
+
+import java.util.Collection;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.request.Read;
+import org.simantics.layer0.Layer0;
+import org.simantics.spreadsheet.resource.SpreadsheetResource;
+import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.representation.Configuration;
+import org.simantics.sysdyn.representation.IElement;
+import org.simantics.sysdyn.representation.Module;
+import org.simantics.sysdyn.representation.Sheet;
+import org.simantics.sysdyn.representation.Variable;
+import org.simantics.sysdyn.ui.modelica.ModelicaSourceViewerConfiguration;
+import org.simantics.sysdyn.ui.properties.widgets.expressions.Function;
+import org.simantics.ui.SimanticsUI;
+
+
+/**
+ * This class is used when renaming an element to check that there
+ * are no elements in the database that would cause a conflict. There
+ * are two kinds of different conflicts:
+ * 1) There is an element in the database which has the same URI.
+ *    Adding another causes damage or even a fatal corruption in the 
+ *    database.
+ * 2) Multiple different elements in the database are accessed with
+ *    identical identifiers in the generated Modelica model. This will
+ *    prevent the simulation from running. 
+ * 
+ * @author Tuomas Miettinen
+ * @author Teemu Lempinen
+ *
+ */
+public abstract class NameValidator {
+
+    /**
+     * This method tells the validator whether the proposed name is taken. To be more precise,
+     * it tells if the proposed name should not be used for any reason. E.g. similarly named
+     * resources cause problems in some occasions and are fine in others. In addition, there
+     * (at least )are two reasons to decline a name proposition: firstly, the data base might
+     * have a similarly named entity, and secondly, accepting a proposed name would lead in
+     * naming conflicts in the generated OpenModelica model.
+     * 
+     * @param graph
+     * @param resource the Resource which is being renamed
+     * @param name the proposed name
+     * @return true iff the name proposition is denied
+     * @throws DatabaseException
+     */
+    protected abstract boolean nameIsTaken(ReadGraph graph, Resource resource, String name) throws DatabaseException;
+
+    /**
+     * Replaces variable names in all the expressions in the defined configuration. 
+     * Replace doesn't have to replace words in other configurations than the configuration where the renamed variable is
+     * because input variables handle the transitions between configurations (modules).
+     * 
+     * @param graph WriteGraph
+     * @param configuration The configuration where the renamed variable is located
+     * @param originalName The original name of the variable
+     * @param newName New name of the variable
+     */
+    public abstract void renameInEquations(WriteGraph graph, Resource resource, String originalName, String newName) throws DatabaseException;
+
+    public abstract void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName) throws DatabaseException;
+
+    /**
+     * Checks that the syntax of the given name is valid and there 
+     * are no other functions that have the same name in neither the 
+     * configuration nor among built in functions
+     *  
+     * @param graph ReadGraph
+     * @param resource The variable that is being renamed
+     * @param name The new name of the variable
+     * @return true iff the new name is valid
+     * @throws DatabaseException
+     */
+    public boolean isValid(ReadGraph graph, Resource resource, String name) throws DatabaseException {
+        // Decline empty string
+        if(name.length() < 1) return false;
+        
+        // Decline names based on the type of the resource
+        if(nameIsTaken(graph, resource, name)) return false;
+        
+        // Decline names which are against Modelica naming rules
+        if(!isValidModelica(name)) return false;
+        return true;
+    }
+
+    /**
+     * Checks that the syntax of the given name is valid and there 
+     * are no other variables that have the same name in the configuration
+     *  
+     * @param variable The variable that is being renamed
+     * @param name The new name of the variable
+     * @return true iff the new name is valid
+     * @throws DatabaseException
+     */
+    public boolean isValid(final Resource resource, final String name) {
+        boolean result = false;
+
+        try {
+            result = SimanticsUI.getSession().syncRequest(new Read<Boolean>() {
+
+                @Override
+                public Boolean perform(ReadGraph graph) throws DatabaseException {
+                    return isValid(graph, resource, name);
+                }
+
+            });
+        } catch (DatabaseException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * Checks that the syntax of the given name is valid 
+     * and that it is not a keyword in Modelica.
+     * 
+     * @param name name that is validated
+     * @return true iff the syntax of the name is valid
+     */
+    public boolean isValidModelica(String name) {
+        String lowerCase = name.toLowerCase();
+        Pattern p = Pattern.compile("[a-zA-Z][a-zA-Z0-9]*+");
+        Matcher m = p.matcher(lowerCase);
+        if (!m.matches() || ModelicaSourceViewerConfiguration.keywords.contains(name))
+            return false;
+        else
+            return true;
+    }
+
+    /**
+     * Checks that there is no similarly named spread sheet in the top level model.
+     * 
+     * @param graph ReadGraph
+     * @param configurationResource Resource of the configuration of the model
+     * @param resource Resource being validated
+     * @param name proposed new name for resource
+     * @return
+     * @throws DatabaseException
+     */
+    protected boolean nameTakenBySheet(
+            ReadGraph graph, 
+            Resource configurationResource, 
+            Resource resource, 
+            String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SpreadsheetResource SHEET = SpreadsheetResource.getInstance(graph);
+        for (Resource r : graph.getObjects(configurationResource, l0.ConsistsOf)) {
+            if (graph.isInstanceOf(r, SHEET.Book)) {
+                for (Resource s : graph.getObjects(r, l0.ConsistsOf)) {
+                    if (NameUtils.getSafeName(graph, s).equals(name) && !s.equals(resource)) {
+                        return true;
+                    }
+                }
+                // Assume only one book
+                break;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Checks that there is no similarly named spread sheet in the top level model.
+     * 
+     * @param sysdynModel the model
+     * @param name proposed new name for resource
+     * @return
+     */
+    public boolean nameTakenBySheet(
+            SysdynModel sysdynModel, 
+            String name) {
+       Configuration configuration = sysdynModel.getConfiguration();
+        if (configuration == null)
+            return true;
+        for (IElement e : configuration.getElements()) {
+            if (e instanceof Sheet) {
+                if (((Sheet)e).getName().equals(name)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check that there are no similarly named functions, module types, or any
+     * other items in the same library. There are actually plenty of items that have
+     * to be avoided, probably all of them, they are all included in this test. 
+     * 
+     * @param graph ReadGraph
+     * @param library Resource which is studied
+     * @param resource Resource being validated
+     * @param name proposed new name for resource
+     * @return
+     * @throws DatabaseException
+     */
+    protected boolean nameTakenByItemUnderLibrary(
+            ReadGraph graph,
+            Resource library,
+            Resource resource,
+            String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        for (Resource r : graph.getObjects(library, l0.ConsistsOf)) {
+            if (NameUtils.getSafeName(graph, r).equals(name) && !r.equals(resource)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Check that there is no similarly named function library among shared function libraries.
+     * 
+     * @param graph ReadGraph
+     * @param model resource of the top level model under which the resource is
+     * @param resource Resource being validated
+     * @param name proposed new name for resource
+     * @return
+     * @throws DatabaseException
+     */
+    protected boolean nameTakenBySharedFunctionLibrary(
+            ReadGraph graph,
+            Resource model, 
+            Resource resource,
+            String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SysdynResource sr = SysdynResource.getInstance(graph);
+        Collection<Resource> linkedResources = graph.getObjects(model, l0.IsLinkedTo);
+        for (Resource r : linkedResources) {
+            // Find the "Shared functions" library 
+            if (graph.isInstanceOf(r, sr.SharedFunctionOntology)) {
+                if (NameUtils.getSafeName(graph, r).equals(name) && !r.equals(resource)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Check that there is no similarly named function among built-in functions
+     * 
+     * @param graph ReadGraph
+     * @param name name that is checked
+     * @return
+     * @throws DatabaseException
+     */
+    protected boolean nameTakenByBuiltInFunction(
+            ReadGraph graph, 
+            String name) throws DatabaseException {
+        for (Function f : Function.getAllBuiltInFunctions(graph)) {
+            if (f.getName().equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Check that the top level of the model doesn't contain 
+     * a variable or module with the same name.
+     * 
+     * @param graph ReadGraph
+     * @param sysdynModel the model
+     * @param resource Resource being validated
+     * @param name proposed new name for resource
+     * @return
+     * @throws DatabaseException
+     */
+    protected boolean nameTakenByTopLevelVariableOrModule(
+            ReadGraph graph,
+            SysdynModel sysdynModel,
+            Resource resource,
+            String name) throws DatabaseException {
+        Configuration configuration = sysdynModel.getConfiguration();
+        if(configuration == null)
+            return true;
+        IElement current = sysdynModel.getElement(resource);
+        for(IElement e : configuration.getElements()) {
+            if(e instanceof Variable) {
+                Variable v = (Variable) e;
+                if(!v.equals(current) && v.getName() != null && v.getName().equals(name)) {
+                    return true;
+                }
+            } else if (e instanceof Module) {
+                Module m = (Module)e;
+                if(!m.equals(current) && m.getName() != null && m.getName().equals(name)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Check that there is no similarly named function, function library,
+     * or module type directly under a library
+     * 
+     * This function should not be used by functions, function libraries, or module types
+     *
+     * @param graph ReadGraph
+     * @param library Resource which is studied
+     * @param name proposed new name for resource
+     * @return
+     * @throws DatabaseException
+     */
+    protected boolean nameTakenByFunctionFunctionLibraryOrModuleType(
+            ReadGraph graph,
+            Resource library,
+            String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SysdynResource sr = SysdynResource.getInstance(graph);
+        for (Resource r : graph.getObjects(library, l0.ConsistsOf)) {
+            if (graph.isInstanceOf(r, sr.SysdynModelicaFunctionLibrary)
+                    || graph.isInstanceOf(r, sr.SysdynModelicaFunction)
+                    || graph.isInheritedFrom(r, sr.Module)) {
+                if (NameUtils.getSafeName(graph, r).equals(name)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SharedFunctionLibraryNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SharedFunctionLibraryNameValidator.java
new file mode 100644
index 00000000..d48e025e
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SharedFunctionLibraryNameValidator.java
@@ -0,0 +1,70 @@
+package org.simantics.sysdyn.ui.utils;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+import org.simantics.simulation.ontology.SimulationResource;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.manager.SysdynModelManager;
+
+/**
+ * Name validator for shared function libraries.
+ * @author Tuomas Miettinen
+ * 
+ */
+public class SharedFunctionLibraryNameValidator extends NameValidator {
+
+    @Override
+    protected boolean nameIsTaken(ReadGraph graph, Resource functionLibrary, String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SimulationResource SIMU = SimulationResource.getInstance(graph);
+        
+        if(functionLibrary == null)
+            return false;
+        
+        // Do the checking for all models that are linked to that shared function library
+        for (Resource model : graph.getObjects(functionLibrary, l0.IsLinkedTo_Inverse)) {
+            if(model == null)
+                return true;
+
+            Resource configurationResource = graph.getPossibleObject(model, SIMU.HasConfiguration);
+            if(configurationResource == null)
+                return true;
+            SysdynModel sysdynModel = SysdynModelManager.getInstance(graph.getSession()).getModel(graph, configurationResource);
+            sysdynModel.update(graph);
+            
+            if (nameTakenByTopLevelVariableOrModule(graph, sysdynModel, null, name)) return true;
+
+            // Check that the functionLibrary name != model name
+            if (NameUtils.getSafeName(graph, model).equals(name)) return true;
+            
+            if (nameTakenByBuiltInFunction(graph, name)) return true;
+
+            if (nameTakenBySharedFunctionLibrary(graph, model, functionLibrary, name)) return true;
+            
+            if (nameTakenBySheet(sysdynModel, name)) return true;
+            
+            if (nameTakenByItemUnderLibrary(graph, model, null, name)) return true;
+        }
+        
+        return false;
+    }
+
+    @Override
+    public void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SheetNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SheetNameValidator.java
new file mode 100644
index 00000000..115f58ec
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/SheetNameValidator.java
@@ -0,0 +1,70 @@
+package org.simantics.sysdyn.ui.utils;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.manager.SysdynModelManager;
+
+/**
+ * Name validator for spread sheets.
+ * @author Tuomas Miettinen
+ * 
+ */
+public class SheetNameValidator extends NameValidator {
+
+    @Override
+    protected boolean nameIsTaken(ReadGraph graph, Resource sheet, String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        
+        if(sheet == null)
+            return false;
+        
+        Resource book = graph.getPossibleObject(sheet, l0.PartOf);
+        if(book == null)
+            return true;
+        
+        Resource configurationResource = graph.getPossibleObject(book, l0.PartOf);
+        if(configurationResource == null)
+            return true;
+        SysdynModel sysdynModel = SysdynModelManager.getInstance(graph.getSession()).getModel(graph, configurationResource);
+        sysdynModel.update(graph);
+        
+        Resource model = graph.getPossibleObject(configurationResource, l0.PartOf);
+        if(model == null)
+            return true;
+
+        if (nameTakenByTopLevelVariableOrModule(graph, sysdynModel, sheet, name)) return true;
+        
+        // Check that the sheet name != model name
+        if (NameUtils.getSafeName(graph, model).equals(name)) return true;
+        
+        if (nameTakenByBuiltInFunction(graph, name)) return true;
+
+        if (nameTakenBySharedFunctionLibrary(graph, model, null, name)) return true;
+        
+        if (nameTakenBySheet(graph, configurationResource, sheet, name)) return true;
+
+        if (nameTakenByItemUnderLibrary(graph, model, null, name)) return true;
+
+        return false;
+    }
+
+    @Override
+    public void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName)
+            throws DatabaseException {
+        // TODO Auto-generated method stub
+
+    }
+
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameUtils.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameUtils.java
deleted file mode 100644
index f3b37044..00000000
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameUtils.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Association for Decentralized Information Management in
- * Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.sysdyn.ui.utils;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.WriteGraph;
-import org.simantics.db.common.utils.ListUtils;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.request.Read;
-import org.simantics.layer0.Layer0;
-import org.simantics.sysdyn.SysdynResource;
-import org.simantics.sysdyn.manager.SysdynModel;
-import org.simantics.sysdyn.representation.Configuration;
-import org.simantics.sysdyn.representation.IElement;
-import org.simantics.sysdyn.representation.Model;
-import org.simantics.sysdyn.representation.Module;
-import org.simantics.sysdyn.representation.ModuleType;
-import org.simantics.sysdyn.representation.Variable;
-import org.simantics.ui.SimanticsUI;
-
-public class VariableNameUtils {
-
-	/**
-	 * Replaces variable names in all the expressions in the defined configuration. 
-	 * Replace doesn't have to replace words in other configurations than the configuration where the renamed variable is
-	 * because input variables handle the transitions between configurations (modules).
-	 * 
-	 * @param graph WriteGraph
-	 * @param configuration The configuration where the renamed variable is located
-	 * @param originalName The original name of the variable
-	 * @param newName New name of the variable
-	 */
-	public static void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName) throws DatabaseException {
-		/*FIXME: 
-		 * How this works when range used in equations has the same string as
-		 * the renamed variable? Should it be possible? 
-		 */ 
-        if(originalName.equals(newName))
-            return; // Do nothing
-		
-        Layer0 l0 = Layer0.getInstance(graph);
-        SysdynResource sr = SysdynResource.getInstance(graph);
-        
-        Resource expressions = graph.getPossibleObject(variable, sr.Variable_expressionList);
-        if(expressions  != null) {
-            List<Resource> expressionList = ListUtils.toList(graph, expressions);
-            for(Resource s : expressionList) {
-                for(Resource p : graph.getPredicates(s)) {
-                    Resource o = graph.getPossibleObject(s, p);
-                    if(o != null && graph.isInstanceOf(o, l0.String) && !p.equals(sr.Expression_arrayRange)) {
-                        String string = graph.getRelatedValue(s, p);
-                        String replaced  = replaceAllWords(string, originalName, newName);
-                        graph.claimLiteral(s, p, replaced);
-                    }
-                }
-            }
-        }
-	}
-	
-	public static void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName) throws DatabaseException {
-	    if(originalName.equals(newName))
-	        return; // Do nothing
-
-	    Layer0 l0 = Layer0.getInstance(graph);
-	    SysdynResource sr = SysdynResource.getInstance(graph);
-	    for(Resource r : graph.getObjects(configuration, l0.ConsistsOf)) {
-	        if(graph.isInstanceOf(r, sr.IndependentVariable)) {
-	            renameInEquations(graph, r, originalName, newName);
-	        }
-	    }
-	}
-
-	private static String replaceAllWords(String original, String find, String replacement) {
-		if(!original.contains(find)) return original;
-		StringBuilder result = new StringBuilder(original.length());
-		String delimiters = "+-*/(){}[],.: \t\n\r\f";
-		StringTokenizer st = new StringTokenizer(original, delimiters, true);
-		while (st.hasMoreTokens()) {
-			String w = st.nextToken();
-			if (w.equals(find)) {
-				result.append(replacement);
-			} else {
-				result.append(w);
-			}
-		}
-		return result.toString();
-	}
-
-
-	private static boolean nameIsTaken(ReadGraph graph, Resource variable, String name) throws DatabaseException {
-		if(variable == null)
-			return false;
-		SysdynModel model = ModelUtils.getModel(graph, variable);
-		if(model == null)
-			return true;
-		Configuration configuration = model.getConfiguration();
-		if(configuration == null)
-		    return true;
-		
-		// Browse through variables and modules within the current module
-		IElement current = model.getElement(variable);
-		for(IElement e : configuration.getElements()) {
-			if(e instanceof Variable) {
-				Variable v = (Variable) e;
-				if(!v.equals(current) && v.getName() != null && v.getName().equals(name)) {
-					return true;
-				}
-			} else if (e instanceof Module) {
-                Module m = (Module)e;
-                if(!m.equals(current) && m.getName() != null && m.getName().equals(name)) {
-                    return true;
-                }
-            }
-		}
-		
-		// Browse through all ModuleTypes within the whole model
-		Model rootModel = null;
-		ModuleType moduleType = configuration.getModuleType();
-		if (moduleType != null) {
-		    Object o = moduleType.getParent();
-		    if (o instanceof Model) {
-		        rootModel = (Model)o;
-		    }
-		} else {
-		    rootModel = configuration.getModel();
-		}
-		if (rootModel != null)
-		    return rootModel.containsModuleType(name);
-		
-		// We should not go here I think
-		return false;
-	}
-
-	/**
-	 * Checks that the syntax of the given name is valid and there 
-	 * are no other variables that have the same name in the configuration
-	 *  
-	 * @param graph ReadGraph
-	 * @param variable The variable that is being renamed
-	 * @param name The new name of the variable
-	 * @return
-	 * @throws DatabaseException
-	 */
-	public static boolean isValid(ReadGraph graph, Resource variable, String name, boolean hasRange) throws DatabaseException {
-		if(name.length() < 1)
-			return false;
-		if(hasRange) {
-			String range = null;
-			if(name.contains("[")) {
-				StringTokenizer st = new StringTokenizer(name, "[]", true);
-				if(st.countTokens() != 4)
-					return false;
-				name = st.nextToken();
-				if(!st.nextToken().equals("[")) return false;
-				range = st.nextToken();
-				if(!st.nextToken().equals("]")) return false;
-			}
-			if(range != null && !ArrayVariableUtils.isRangeValid(graph, variable, range)) return false;
-		}
-		if(nameIsTaken(graph, variable, name)) return false;
-		if(!isValid(name)) return false;
-		return true;
-	}
-
-	
-	/**
-	 * Checks that the syntax of the given name is valid and there 
-	 * are no other variables that have the same name in the configuration
-	 *  
-	 * @param variable The variable that is being renamed
-	 * @param name The new name of the variable
-	 * @return
-	 * @throws DatabaseException
-	 */
-	public static boolean isValid(final Resource variable, final String name, final boolean hasRange) {
-		boolean result = false;
-		try {
-			result = SimanticsUI.getSession().syncRequest(new Read<Boolean>() {
-
-				@Override
-				public Boolean perform(ReadGraph graph) throws DatabaseException {
-					return isValid(graph, variable, name, hasRange);
-				}
-
-			});
-		} catch (DatabaseException e) {
-			e.printStackTrace();
-		}
-		return result;
-	}
-
-	/**
-	 * Checks that the syntax of the given name is valid 
-	 * and that it is not a keyword in Modelica.
-	 * 
-	 * @param name
-	 * @return
-	 */
-	public static boolean isValid(String name) {
-		String lowerCase = name.toLowerCase();
-		Pattern p = Pattern.compile("[a-zA-Z][a-zA-Z0-9]*+");
-		Matcher m = p.matcher(lowerCase);
-		if (!m.matches() || keywords.contains(name))
-			return false;
-		else
-			return true;
-	}
-
-	public static final Set<String> keywords = new HashSet<String>();
-
-	static {
-		keywords.add("algorithm");
-		keywords.add("discrete");
-		keywords.add("false");
-		keywords.add("model");
-		keywords.add("redeclare");
-		keywords.add("and");
-		keywords.add("each");
-		keywords.add("final");
-		keywords.add("not");
-		keywords.add("replaceable");
-		keywords.add("annotation");
-		keywords.add("else");
-		keywords.add("flow");
-		keywords.add("operator");
-		keywords.add("return");
-		keywords.add("assert");
-		keywords.add("elseif");
-		keywords.add("for");
-		keywords.add("or");
-		keywords.add("stream");
-		keywords.add("block");
-		keywords.add("elsewhen");
-		keywords.add("function");
-		keywords.add("outer");
-		keywords.add("then");
-		keywords.add("break");
-		keywords.add("encapsulated");
-		keywords.add("if");
-		keywords.add("output");
-		keywords.add("true");
-		keywords.add("class");
-		keywords.add("end");
-		keywords.add("import");
-		keywords.add("package");
-		keywords.add("type");
-		keywords.add("connect");
-		keywords.add("enumeration");
-		keywords.add("in");
-		keywords.add("parameter");
-		keywords.add("when");
-		keywords.add("connector");
-		keywords.add("equation");
-		keywords.add("initial");
-		keywords.add("partial");
-		keywords.add("while");
-		keywords.add("constant");
-		keywords.add("expandable");
-		keywords.add("inner");
-		keywords.add("protected");
-		keywords.add("within");
-		keywords.add("constrainedby");
-		keywords.add("extends");
-		keywords.add("input");
-		keywords.add("public");
-		keywords.add("der");
-		keywords.add("external");
-		keywords.add("loop");
-		keywords.add("record");
-		keywords.add("time");
-	}
-}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameValidator.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameValidator.java
new file mode 100644
index 00000000..969517b2
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/VariableNameValidator.java
@@ -0,0 +1,219 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.sysdyn.ui.utils;
+
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.ListUtils;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.request.Read;
+import org.simantics.layer0.Layer0;
+import org.simantics.sysdyn.SysdynResource;
+import org.simantics.sysdyn.manager.SysdynModel;
+import org.simantics.sysdyn.representation.Configuration;
+import org.simantics.sysdyn.representation.Model;
+import org.simantics.sysdyn.representation.ModuleType;
+import org.simantics.ui.SimanticsUI;
+
+/**
+ * Name validator for variables, modules, and enumerations.
+ * @author Teemu Lempinen
+ * @author Tuomas Miettinen
+ * 
+ */
+public class VariableNameValidator extends NameValidator {
+
+	@Override
+    public void renameInEquations(WriteGraph graph, Resource variable, String originalName, String newName) throws DatabaseException {
+		/*FIXME: 
+		 * How this works when range used in equations has the same string as
+		 * the renamed variable? Should it be possible? 
+		 */ 
+        if(originalName.equals(newName))
+            return; // Do nothing
+		
+        Layer0 l0 = Layer0.getInstance(graph);
+        SysdynResource sr = SysdynResource.getInstance(graph);
+        
+        Resource expressions = graph.getPossibleObject(variable, sr.Variable_expressionList);
+        if(expressions  != null) {
+            List<Resource> expressionList = ListUtils.toList(graph, expressions);
+            for(Resource s : expressionList) {
+                for(Resource p : graph.getPredicates(s)) {
+                    Resource o = graph.getPossibleObject(s, p);
+                    if(o != null && graph.isInstanceOf(o, l0.String) && !p.equals(sr.Expression_arrayRange)) {
+                        String string = graph.getRelatedValue(s, p);
+                        String replaced  = replaceAllWords(string, originalName, newName);
+                        graph.claimLiteral(s, p, replaced);
+                    }
+                }
+            }
+        }
+	}
+	
+	@Override
+    public void renameInAllEquations(WriteGraph graph, Resource configuration, String originalName, String newName) throws DatabaseException {
+	    if(originalName.equals(newName))
+	        return; // Do nothing
+
+	    Layer0 l0 = Layer0.getInstance(graph);
+	    SysdynResource sr = SysdynResource.getInstance(graph);
+	    for(Resource r : graph.getObjects(configuration, l0.ConsistsOf)) {
+	        if(graph.isInstanceOf(r, sr.IndependentVariable)) {
+	            renameInEquations(graph, r, originalName, newName);
+	        }
+	    }
+	}
+
+	private String replaceAllWords(String original, String find, String replacement) {
+		if(!original.contains(find)) return original;
+		StringBuilder result = new StringBuilder(original.length());
+		String delimiters = "+-*/(){}[],.: \t\n\r\f";
+		StringTokenizer st = new StringTokenizer(original, delimiters, true);
+		while (st.hasMoreTokens()) {
+			String w = st.nextToken();
+			if (w.equals(find)) {
+				result.append(replacement);
+			} else {
+				result.append(w);
+			}
+		}
+		return result.toString();
+	}
+
+
+	@Override
+    protected boolean nameIsTaken(ReadGraph graph, Resource variable, String name) throws DatabaseException {
+        Layer0 l0 = Layer0.getInstance(graph);
+        SysdynResource sr = SysdynResource.getInstance(graph);
+
+        if(variable == null)
+			return false;
+        
+		SysdynModel sysdynModel = ModelUtils.getModel(graph, variable);
+		if(sysdynModel == null)
+			return true;
+		sysdynModel.update(graph);
+        
+		Configuration configuration = sysdynModel.getConfiguration();
+		if(configuration == null)
+		    return true;
+		
+		// Get the top level model
+        Model rootModel = null;
+        ModuleType moduleType = configuration.getModuleType();
+        if (moduleType != null) {
+            Object o = moduleType.getParent();
+            if (o instanceof Model) {
+                rootModel = (Model)o;
+            }
+        } else {
+            rootModel = configuration.getModel();
+        }
+        
+        // Get the top level model (SysdynModel)
+        // Resource library should be used with care if it is not instance of sr.SysdynModel
+        Resource library = graph.getPossibleObject(variable, l0.PartOf);
+        if(library == null) {
+            return true;
+        } else {
+            library = graph.getPossibleObject(library, l0.PartOf);
+            if(library == null) {
+                return true;
+            }
+        }
+
+		// Check if the function is right under the model.
+        if (graph.isInstanceOf(library, sr.SysdynModel)) {
+            // Check that the function name != model name (== library name)
+            if (NameUtils.getSafeName(graph, library).equals(name)) return true;
+            
+            if (nameTakenByBuiltInFunction(graph, name)) return true;
+
+            if (nameTakenBySharedFunctionLibrary(graph, library, null, name)) return true;
+            
+            if (nameTakenBySheet(sysdynModel, name)) return true;
+        }
+
+		if (nameTakenByTopLevelVariableOrModule(graph, sysdynModel, variable, name)) return true;
+
+		if (rootModel != null) {
+		    // Browse through all ModuleTypes within the whole model
+	        if (rootModel.containsModuleType(name))
+		        return true;
+		}
+		
+		if (nameTakenByFunctionFunctionLibraryOrModuleType(graph, library, name)) return true;
+		
+		return false;
+	}
+
+	/**
+	 * Checks that the syntax of the given name is valid and there 
+	 * are no other variables that have the same name in the configuration
+	 *  
+	 * @param graph ReadGraph
+	 * @param variable The variable that is being renamed
+	 * @param name The new name of the variable
+	 * @return
+	 * @throws DatabaseException
+	 */
+	public boolean isValid(ReadGraph graph, Resource variable, String name, boolean hasRange) throws DatabaseException {
+	    if(hasRange) {
+			String range = null;
+			if(name.contains("[")) {
+				StringTokenizer st = new StringTokenizer(name, "[]", true);
+				if(st.countTokens() != 4)
+					return false;
+				name = st.nextToken();
+				if(!st.nextToken().equals("[")) return false;
+				range = st.nextToken();
+				if(!st.nextToken().equals("]")) return false;
+			}
+			if(range != null && !ArrayVariableUtils.isRangeValid(graph, variable, range)) return false;
+		}
+		return isValid(graph, variable, name);
+	}
+
+	
+	/**
+	 * Checks that the syntax of the given name is valid and there 
+	 * are no other variables that have the same name in the configuration
+	 *  
+	 * @param variable The variable that is being renamed
+	 * @param name The new name of the variable
+	 * @return
+	 * @throws DatabaseException
+	 */
+	public boolean isValid(final Resource variable, final String name, final boolean hasRange) {
+		boolean result = false;
+		try {
+			result = SimanticsUI.getSession().syncRequest(new Read<Boolean>() {
+
+				@Override
+				public Boolean perform(ReadGraph graph) throws DatabaseException {
+					return isValid(graph, variable, name, hasRange);
+				}
+
+			});
+		} catch (DatabaseException e) {
+			e.printStackTrace();
+		}
+		return result;
+	}
+
+}
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java
index bb4e3f66..5403623e 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Model.java
@@ -178,6 +178,30 @@ public class Model {
         return false;
     }
     
+    /**
+     * Determine if this Model consists of a certain Function or 
+     * FunctionLibrary ON THE TOP LEVEL.
+     * @param elementName The name of the element that is sought 
+     * @return true iff this consists of element
+     */
+    public boolean containsFunctionOrLibrary(String elementName) {
+        if(consistsOf != null ) {
+            for(Object o : consistsOf) {
+                if(o instanceof Function) {
+                    Function f = (Function)o;
+                    if (f.getName().equals(elementName)) 
+                        return true;
+                }
+                else if(o instanceof FunctionLibrary) {
+                    FunctionLibrary fl = (FunctionLibrary)o;
+                    if (fl.getName().equals(elementName)) 
+                        return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Add built-in functions to functions map. Built-in functions do not have any library path.
      * @param library Built-in function library
-- 
2.47.1