diff --git a/templates/machine.m.motemplate b/templates/machine.m.motemplate
index 19e932e5..6f109876 100644
--- a/templates/machine.m.motemplate
+++ b/templates/machine.m.motemplate
@@ -58,20 +58,20 @@ const struct <$managedObjectClassName$>FetchedProperties <$managedObjectClassNam
 
 - (<$Attribute.attributeTypeName$>)<$Attribute.name$>Value {
 	NSNumber *result = [self <$Attribute.name$>];
-	return [result <$Attribute.scalarAttributeAccessorMethod$>];
+	return [result <$Attribute.scalarAccessorMethodName$>];
 }
 
 - (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.attributeTypeName$>)value_ {
-	[self set<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarAttributeFactoryMethod$>value_]];
+	[self set<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarFactoryMethodName$>value_]];
 }
 
 - (<$Attribute.attributeTypeName$>)primitive<$Attribute.name.initialCapitalString$>Value {
 	NSNumber *result = [self primitive<$Attribute.name.initialCapitalString$>];
-	return [result <$Attribute.scalarAttributeAccessorMethod$>];
+	return [result <$Attribute.scalarAccessorMethodName$>];
 }
 
 - (void)setPrimitive<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_ {
-	[self setPrimitive<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarAttributeFactoryMethod$>value_]];
+	[self setPrimitive<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarFactoryMethodName$>value_]];
 }
 <$endif$>
 <$endif$>