diff --git a/src/main/java/spoon/reflect/code/CtLiteral.java b/src/main/java/spoon/reflect/code/CtLiteral.java
index f3e6fb726c0..9e6349351b9 100644
--- a/src/main/java/spoon/reflect/code/CtLiteral.java
+++ b/src/main/java/spoon/reflect/code/CtLiteral.java
@@ -19,7 +19,7 @@
 import spoon.reflect.annotations.PropertyGetter;
 import spoon.reflect.annotations.PropertySetter;
 
-import static spoon.reflect.path.CtRole.EXPRESSION;
+import static spoon.reflect.path.CtRole.VALUE;
 
 /**
  * This code element defines a literal value (an int, a string, etc).
@@ -37,13 +37,13 @@ public interface CtLiteral<T> extends CtExpression<T> {
 	/**
 	 * Gets the actual value of the literal (statically known).
 	 */
-	@PropertyGetter(role = EXPRESSION)
+	@PropertyGetter(role = VALUE)
 	T getValue();
 
 	/**
 	 * Sets the actual value of the literal.
 	 */
-	@PropertySetter(role = EXPRESSION)
+	@PropertySetter(role = VALUE)
 	<C extends CtLiteral<T>> C setValue(T value);
 
 	/** Overriding return type, a clone of a CtLiteral returns a CtLiteral */
diff --git a/src/main/java/spoon/reflect/code/CtNewClass.java b/src/main/java/spoon/reflect/code/CtNewClass.java
index dfbfd984edd..fb53fd0d181 100644
--- a/src/main/java/spoon/reflect/code/CtNewClass.java
+++ b/src/main/java/spoon/reflect/code/CtNewClass.java
@@ -26,6 +26,7 @@
 
 import java.util.List;
 
+import static spoon.reflect.path.CtRole.EXPRESSION;
 import static spoon.reflect.path.CtRole.TYPE_PARAMETER;
 
 /**
@@ -76,11 +77,13 @@ public interface CtNewClass<T> extends CtConstructorCall<T> {
 	/**
 	 * Gets the created class.
 	 */
+	@PropertyGetter(role = EXPRESSION)
 	CtClass<?> getAnonymousClass();
 
 	/**
 	 * Sets the created class.
 	 */
+	@PropertySetter(role = EXPRESSION)
 	<N extends CtNewClass> N setAnonymousClass(CtClass<?> anonymousClass);
 
 	@Override
diff --git a/src/main/java/spoon/reflect/code/CtSynchronized.java b/src/main/java/spoon/reflect/code/CtSynchronized.java
index b78c474d4bc..b7993fb357c 100644
--- a/src/main/java/spoon/reflect/code/CtSynchronized.java
+++ b/src/main/java/spoon/reflect/code/CtSynchronized.java
@@ -58,7 +58,7 @@ public interface CtSynchronized extends CtStatement {
 	/**
 	 * Sets the synchronized block.
 	 */
-	@PropertyGetter(role = BODY)
+	@PropertySetter(role = BODY)
 	<T extends CtSynchronized> T setBlock(CtBlock<?> block);
 
 	@Override
diff --git a/src/main/java/spoon/reflect/declaration/CtCodeSnippet.java b/src/main/java/spoon/reflect/declaration/CtCodeSnippet.java
index 023dda5129b..bada4f297b2 100644
--- a/src/main/java/spoon/reflect/declaration/CtCodeSnippet.java
+++ b/src/main/java/spoon/reflect/declaration/CtCodeSnippet.java
@@ -16,6 +16,7 @@
  */
 package spoon.reflect.declaration;
 
+import spoon.reflect.annotations.PropertyGetter;
 import spoon.reflect.annotations.PropertySetter;
 
 import static spoon.reflect.path.CtRole.EXPRESSION;
@@ -35,7 +36,7 @@ public interface CtCodeSnippet {
 	/**
 	 * Sets the textual value of the code.
 	 */
-	@PropertySetter(role = EXPRESSION)
+	@PropertyGetter(role = EXPRESSION)
 	<C extends CtCodeSnippet> C setValue(String value);
 
 	/**
diff --git a/src/main/java/spoon/reflect/declaration/CtPackage.java b/src/main/java/spoon/reflect/declaration/CtPackage.java
index f27216683a0..d45c3ebca70 100644
--- a/src/main/java/spoon/reflect/declaration/CtPackage.java
+++ b/src/main/java/spoon/reflect/declaration/CtPackage.java
@@ -97,11 +97,13 @@ public interface CtPackage extends CtNamedElement, CtShadowable {
 	/**
 	 * Adds a type to this package.
 	 */
+	@PropertySetter(role = TYPE)
 	<T extends CtPackage> T addType(CtType<?> type);
 
 	/**
 	 * Removes a type from this package.
 	 */
+	@PropertySetter(role = TYPE)
 	void removeType(CtType<?> type);
 
 	/**
@@ -128,6 +130,7 @@ public interface CtPackage extends CtNamedElement, CtShadowable {
 	 * @param pack
 	 * @return <tt>true</tt> if this element changed as a result of the call
 	 */
+	@PropertySetter(role = SUB_PACKAGE)
 	boolean removePackage(CtPackage pack);
 
 	/**
@@ -136,7 +139,7 @@ public interface CtPackage extends CtNamedElement, CtShadowable {
 	 * @param types
 	 * 		new Set of types
 	 */
-	@PropertyGetter(role = TYPE)
+	@PropertySetter(role = TYPE)
 	<T extends CtPackage> T setTypes(Set<CtType<?>> types);
 
 	@Override
diff --git a/src/main/java/spoon/support/reflect/code/CtAssertImpl.java b/src/main/java/spoon/support/reflect/code/CtAssertImpl.java
index 37a57a6706d..7b9335a522e 100644
--- a/src/main/java/spoon/support/reflect/code/CtAssertImpl.java
+++ b/src/main/java/spoon/support/reflect/code/CtAssertImpl.java
@@ -28,7 +28,7 @@ public class CtAssertImpl<T> extends CtStatementImpl implements CtAssert<T> {
 	@MetamodelPropertyField(role = CtRole.CONDITION)
 	CtExpression<Boolean> asserted;
 
-	@MetamodelPropertyField(role = CtRole.VALUE)
+	@MetamodelPropertyField(role = CtRole.EXPRESSION)
 	CtExpression<T> value;
 
 	@Override
diff --git a/src/main/java/spoon/support/reflect/code/CtCodeSnippetExpressionImpl.java b/src/main/java/spoon/support/reflect/code/CtCodeSnippetExpressionImpl.java
index 8bfca5d8fe2..a4d7e2df8ad 100644
--- a/src/main/java/spoon/support/reflect/code/CtCodeSnippetExpressionImpl.java
+++ b/src/main/java/spoon/support/reflect/code/CtCodeSnippetExpressionImpl.java
@@ -33,7 +33,7 @@ public void accept(CtVisitor visitor) {
 		visitor.visitCtCodeSnippetExpression(this);
 	}
 
-	@MetamodelPropertyField(role = CtRole.VALUE)
+	@MetamodelPropertyField(role = CtRole.EXPRESSION)
 	String value;
 
 	public String getValue() {
diff --git a/src/main/java/spoon/support/reflect/code/CtCodeSnippetStatementImpl.java b/src/main/java/spoon/support/reflect/code/CtCodeSnippetStatementImpl.java
index 18fc95a728c..06d95a872c0 100644
--- a/src/main/java/spoon/support/reflect/code/CtCodeSnippetStatementImpl.java
+++ b/src/main/java/spoon/support/reflect/code/CtCodeSnippetStatementImpl.java
@@ -33,7 +33,7 @@ public void accept(CtVisitor visitor) {
 		visitor.visitCtCodeSnippetStatement(this);
 	}
 
-	@MetamodelPropertyField(role = CtRole.VALUE)
+	@MetamodelPropertyField(role = CtRole.EXPRESSION)
 	String value;
 
 	public String getValue() {
diff --git a/src/main/java/spoon/support/reflect/code/CtCommentImpl.java b/src/main/java/spoon/support/reflect/code/CtCommentImpl.java
index 34018a9b8cb..3062686f19f 100644
--- a/src/main/java/spoon/support/reflect/code/CtCommentImpl.java
+++ b/src/main/java/spoon/support/reflect/code/CtCommentImpl.java
@@ -27,7 +27,7 @@ public class CtCommentImpl extends CtStatementImpl implements CtComment {
 	@MetamodelPropertyField(role = CtRole.COMMENT_CONTENT)
 	private String content;
 
-	@MetamodelPropertyField(role = CtRole.TYPE)
+	@MetamodelPropertyField(role = CtRole.COMMENT_TYPE)
 	private CommentType type;
 
 	@Override