diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp
index 1b70952a619addb3b43c648a693fbbc0e82349e2..8d19962a4a3e0d8779ce5e9e5edf0a66d393b04e 100644
--- a/ets2panda/checker/ETSAnalyzer.cpp
+++ b/ets2panda/checker/ETSAnalyzer.cpp
@@ -232,23 +232,23 @@ void DoBodyTypeChecking(ETSChecker *checker, ir::MethodDefinition *node, ir::Scr
 
 void CheckGetterSetterTypeConstrains(ETSChecker *checker, ir::ScriptFunction *scriptFunc)
 {
-    if (scriptFunc->IsSetter() && (scriptFunc->Signature()->ReturnType() != checker->GlobalBuiltinVoidType())) {
+    if (scriptFunc->IsSetter() && (scriptFunc->Signature()->ReturnType() != checker->GlobalVoidType())) {
         checker->ThrowTypeError("Setter must have void return type", scriptFunc->Start());
     }
 
-    if (scriptFunc->IsGetter() && (scriptFunc->Signature()->ReturnType() == checker->GlobalBuiltinVoidType())) {
+    if (scriptFunc->IsGetter() && (scriptFunc->Signature()->ReturnType() == checker->GlobalVoidType())) {
         checker->ThrowTypeError("Getter must return a value", scriptFunc->Start());
     }
 
     auto const name = scriptFunc->Id()->Name();
     if (name.Is(compiler::Signatures::GET_INDEX_METHOD)) {
-        if (scriptFunc->Signature()->ReturnType() == checker->GlobalBuiltinVoidType()) {
+        if (scriptFunc->Signature()->ReturnType() == checker->GlobalVoidType()) {
             checker->ThrowTypeError(std::string {ir::INDEX_ACCESS_ERROR_1} + std::string {name.Utf8()} +
                                         std::string {"' shouldn't have void return type."},
                                     scriptFunc->Start());
         }
     } else if (name.Is(compiler::Signatures::SET_INDEX_METHOD)) {
-        if (scriptFunc->Signature()->ReturnType() != checker->GlobalBuiltinVoidType()) {
+        if (scriptFunc->Signature()->ReturnType() != checker->GlobalVoidType()) {
             checker->ThrowTypeError(std::string {ir::INDEX_ACCESS_ERROR_1} + std::string {name.Utf8()} +
                                         std::string {"' should have void return type."},
                                     scriptFunc->Start());
@@ -2151,9 +2151,7 @@ void CheckArgumentVoidType(checker::Type *&funcReturnType, ETSChecker *checker,
                            ir::ReturnStatement *st)
 {
     if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) {
-        if (funcReturnType == checker->GlobalBuiltinVoidType()) {
-            funcReturnType = checker->GlobalVoidType();
-        } else if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) {
+        if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) {
             checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start());
         }
     }
@@ -2162,8 +2160,8 @@ void CheckArgumentVoidType(checker::Type *&funcReturnType, ETSChecker *checker,
 void CheckReturnType(ETSChecker *checker, checker::Type *funcReturnType, checker::Type *argumentType,
                      ir::Expression *stArgument)
 {
-    if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalBuiltinVoidType()) {
-        if (argumentType != checker->GlobalVoidType() && argumentType != checker->GlobalBuiltinVoidType()) {
+    if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalVoidType()) {
+        if (argumentType != checker->GlobalVoidType()) {
             checker->ThrowTypeError("Unexpected return value, enclosing method return type is void.",
                                     stArgument->Start());
         }
@@ -2182,9 +2180,7 @@ void InferReturnType(ETSChecker *checker, ir::ScriptFunction *containingFunc, ch
                      ir::Expression *stArgument)
 {
     //  First (or single) return statement in the function:
-    funcReturnType = stArgument == nullptr
-                         ? containingFunc->IsEntryPoint() ? checker->GlobalVoidType() : checker->GlobalBuiltinVoidType()
-                         : stArgument->Check(checker);
+    funcReturnType = stArgument == nullptr ? checker->GlobalVoidType() : stArgument->Check(checker);
     if (funcReturnType->HasTypeFlag(checker::TypeFlag::CONSTANT)) {
         // remove CONSTANT type modifier if exists
         funcReturnType =
@@ -2227,22 +2223,20 @@ void ProcessReturnStatements(ETSChecker *checker, ir::ScriptFunction *containing
 
     if (stArgument == nullptr) {
         // previous return statement(s) have value
-        if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalBuiltinVoidType()) {
+        if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalVoidType()) {
             checker->ThrowTypeError("All return statements in the function should be empty or have a value.",
                                     st->Start());
         }
     } else {
         //  previous return statement(s) don't have any value
-        if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalBuiltinVoidType()) {
+        if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalVoidType()) {
             checker->ThrowTypeError("All return statements in the function should be empty or have a value.",
                                     stArgument->Start());
         }
 
         const auto name = containingFunc->Scope()->InternalName().Mutf8();
         if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) {
-            if (funcReturnType == checker->GlobalBuiltinVoidType()) {
-                funcReturnType = checker->GlobalVoidType();
-            } else if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) {
+            if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) {
                 checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start());
             }
         }
@@ -2293,11 +2287,10 @@ checker::Type *ETSAnalyzer::GetFunctionReturnType(ir::ReturnStatement *st, ir::S
         funcReturnType = checker->GetTypeFromTypeAnnotation(returnTypeAnnotation);
 
         if (st->argument_ == nullptr) {
-            if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalBuiltinVoidType()) {
+            if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalVoidType()) {
                 checker->ThrowTypeError("Missing return value.", st->Start());
             }
-            funcReturnType =
-                containingFunc->IsEntryPoint() ? checker->GlobalVoidType() : checker->GlobalBuiltinVoidType();
+            funcReturnType = checker->GlobalVoidType();
         } else {
             const auto name = containingFunc->Scope()->InternalName().Mutf8();
             CheckArgumentVoidType(funcReturnType, checker, name, st);
diff --git a/ets2panda/checker/ETSchecker.cpp b/ets2panda/checker/ETSchecker.cpp
index 6d31c35189d134c58870c202327121f77a152757..fb957f142b2d6dacd0fa0736abafeff1a3f65235 100644
--- a/ets2panda/checker/ETSchecker.cpp
+++ b/ets2panda/checker/ETSchecker.cpp
@@ -37,20 +37,13 @@ void ETSChecker::InitializeBuiltins(varbinder::ETSBinder *varbinder)
 
     const auto varMap = varbinder->TopScope()->Bindings();
 
-    auto initBuiltin = [varMap](ETSChecker *checker, std::string_view signature) -> util::StringView {
-        const auto iterator = varMap.find(signature);
-        ASSERT(iterator != varMap.end());
-        checker->GetGlobalTypesHolder()->InitializeBuiltin(
-            iterator->first,
-            checker->BuildClassProperties(iterator->second->Declaration()->Node()->AsClassDefinition()));
-        return iterator->first;
-    };
-
-    auto const objectName = initBuiltin(this, compiler::Signatures::BUILTIN_OBJECT_CLASS);
-    auto const voidName = initBuiltin(this, compiler::Signatures::BUILTIN_VOID_CLASS);
+    const auto object = varMap.find("Object");
+    ASSERT(object != varMap.end());
+    GetGlobalTypesHolder()->InitializeBuiltin(
+        object->first, BuildClassProperties(object->second->Declaration()->Node()->AsClassDefinition()));
 
     for (const auto &[name, var] : varMap) {
-        if (name == objectName || name == voidName) {
+        if (name == object->first) {
             continue;
         }
 
@@ -291,11 +284,6 @@ ETSObjectType *ETSChecker::GlobalBuiltinJSValueType() const
     return AsETSObjectType(&GlobalTypesHolder::GlobalJSValueBuiltinType);
 }
 
-ETSObjectType *ETSChecker::GlobalBuiltinVoidType() const
-{
-    return AsETSObjectType(&GlobalTypesHolder::GlobalBuiltinVoidType);
-}
-
 ETSObjectType *ETSChecker::GlobalBuiltinDynamicType(Language lang) const
 {
     if (lang.GetId() == Language::Id::JS) {
diff --git a/ets2panda/checker/ETSchecker.h b/ets2panda/checker/ETSchecker.h
index bf0543ae026b52117bb2a07441f87749ee8b958a..5e417d91c25c9e0ea75251e044e480d496963144 100644
--- a/ets2panda/checker/ETSchecker.h
+++ b/ets2panda/checker/ETSchecker.h
@@ -116,7 +116,6 @@ public:
     ETSObjectType *GlobalBuiltinJSRuntimeType() const;
     ETSObjectType *GlobalBuiltinJSValueType() const;
     ETSObjectType *GlobalBuiltinBoxType(const Type *contents) const;
-    ETSObjectType *GlobalBuiltinVoidType() const;
 
     ETSObjectType *GlobalBuiltinDynamicType(Language lang) const;
 
@@ -344,7 +343,7 @@ public:
     void CheckObjectLiteralArguments(Signature *sig, ArenaVector<ir::Expression *> const &arguments);
     Signature *ComposeSignature(ir::ScriptFunction *func, SignatureInfo *signatureInfo, Type *returnType,
                                 varbinder::Variable *nameVar);
-    Type *ComposeReturnType(ir::ScriptFunction *func, util::StringView funcName, bool isConstructSig);
+    Type *ComposeReturnType(ir::ScriptFunction *func);
     SignatureInfo *ComposeSignatureInfo(ir::ScriptFunction *func);
     void ValidateMainSignature(ir::ScriptFunction *func);
     checker::ETSFunctionType *BuildFunctionSignature(ir::ScriptFunction *func, bool isConstructSig = false);
diff --git a/ets2panda/checker/ets/aliveAnalyzer.cpp b/ets2panda/checker/ets/aliveAnalyzer.cpp
index b12ca4caff221d3f7f12c407e3e41e86958efac4..85805e0b48b4981ab365fea6e56cf60c351c87ab 100644
--- a/ets2panda/checker/ets/aliveAnalyzer.cpp
+++ b/ets2panda/checker/ets/aliveAnalyzer.cpp
@@ -274,13 +274,13 @@ void AliveAnalyzer::AnalyzeMethodDef(const ir::MethodDefinition *methodDef)
     AnalyzeStat(func->Body());
     ASSERT(methodDef->TsType() && methodDef->TsType()->IsETSFunctionType());
     const auto *returnType = methodDef->TsType()->AsETSFunctionType()->FindSignature(func)->ReturnType();
-    const auto isVoid = returnType->IsETSVoidType() || returnType == checker_->GlobalBuiltinVoidType();
+    const auto isVoid = returnType->IsETSVoidType() || returnType == checker_->GlobalVoidType();
 
     auto isPromiseVoid = false;
 
     if (returnType->IsETSAsyncFuncReturnType()) {
         const auto *asAsync = returnType->AsETSAsyncFuncReturnType();
-        isPromiseVoid = asAsync->GetPromiseTypeArg() == checker_->GlobalBuiltinVoidType();
+        isPromiseVoid = asAsync->GetPromiseTypeArg() == checker_->GlobalETSUndefinedType();
     }
 
     if (status_ == LivenessStatus::ALIVE && !isVoid && !isPromiseVoid) {
diff --git a/ets2panda/checker/ets/dynamic.cpp b/ets2panda/checker/ets/dynamic.cpp
index c72d8eff47f0c419df43fe68843b55209e1e2873..ded416e9d7466cf57a036ff8d1ced0c59a0075b6 100644
--- a/ets2panda/checker/ets/dynamic.cpp
+++ b/ets2panda/checker/ets/dynamic.cpp
@@ -499,7 +499,7 @@ ir::MethodDefinition *ETSChecker::CreateDynamicModuleClassInitMethod(varbinder::
                                    [this]([[maybe_unused]] varbinder::FunctionScope *scope,
                                           [[maybe_unused]] ArenaVector<ir::Statement *> *statements,
                                           [[maybe_unused]] ArenaVector<ir::Expression *> *params,
-                                          Type **returnType) { *returnType = GlobalBuiltinVoidType(); });
+                                          Type **returnType) { *returnType = GlobalVoidType(); });
 }
 
 ir::MethodDefinition *ETSChecker::CreateLambdaObjectClassInvokeMethod(varbinder::ClassScope *classScope,
diff --git a/ets2panda/checker/ets/function.cpp b/ets2panda/checker/ets/function.cpp
index 825208c82e73a1b975e12d4637c04bc25dedf2a4..14bf4256ba35171217603f19ec82c9c04540e60b 100644
--- a/ets2panda/checker/ets/function.cpp
+++ b/ets2panda/checker/ets/function.cpp
@@ -853,28 +853,14 @@ Signature *ETSChecker::ComposeSignature(ir::ScriptFunction *func, SignatureInfo
     return signature;
 }
 
-Type *ETSChecker::ComposeReturnType(ir::ScriptFunction *func, util::StringView funcName, bool isConstructSig)
+Type *ETSChecker::ComposeReturnType(ir::ScriptFunction *func)
 {
     auto *const returnTypeAnnotation = func->ReturnTypeAnnotation();
     checker::Type *returnType {};
 
     if (returnTypeAnnotation == nullptr) {
         // implicit void return type
-        returnType = isConstructSig || func->IsEntryPoint() || funcName.Is(compiler::Signatures::CCTOR)
-                         ? GlobalVoidType()
-                         : GlobalBuiltinVoidType();
-
-        if (returnType == nullptr) {
-            const auto varMap = VarBinder()->TopScope()->Bindings();
-
-            const auto builtinVoid = varMap.find(compiler::Signatures::BUILTIN_VOID_CLASS);
-            ASSERT(builtinVoid != varMap.end());
-
-            BuildClassProperties(builtinVoid->second->Declaration()->Node()->AsClassDefinition());
-
-            ASSERT(GlobalBuiltinVoidType() != nullptr);
-            returnType = GlobalBuiltinVoidType();
-        }
+        returnType = GlobalVoidType();
 
         if (func->IsAsyncFunc()) {
             auto implicitPromiseVoid = [this]() {
@@ -883,13 +869,13 @@ Type *ETSChecker::ComposeReturnType(ir::ScriptFunction *func, util::StringView f
                     promiseGlobal->Instantiate(Allocator(), Relation(), GetGlobalTypesHolder())->AsETSObjectType();
                 promiseType->AddTypeFlag(checker::TypeFlag::GENERIC);
                 promiseType->TypeArguments().clear();
-                promiseType->TypeArguments().emplace_back(GlobalBuiltinVoidType());
+                promiseType->TypeArguments().emplace_back(GlobalVoidType());
                 return promiseType;
             };
 
             returnType = implicitPromiseVoid();
         }
-    } else if (func->IsEntryPoint() && returnTypeAnnotation->GetType(this) == GlobalBuiltinVoidType()) {
+    } else if (func->IsEntryPoint() && returnTypeAnnotation->GetType(this) == GlobalVoidType()) {
         returnType = GlobalVoidType();
     } else {
         returnType = GetTypeFromTypeAnnotation(returnTypeAnnotation);
@@ -983,7 +969,7 @@ checker::ETSFunctionType *ETSChecker::BuildFunctionSignature(ir::ScriptFunction
         ValidateMainSignature(func);
     }
 
-    auto *returnType = ComposeReturnType(func, funcName, isConstructSig);
+    auto *returnType = ComposeReturnType(func);
     auto *signature = ComposeSignature(func, signatureInfo, returnType, nameVar);
     if (isConstructSig) {
         signature->AddSignatureFlag(SignatureFlags::CONSTRUCT);
@@ -2620,7 +2606,8 @@ bool ETSChecker::IsReturnTypeSubstitutable(Signature *const s1, Signature *const
 
     // - If R1 is a reference type then R1, adapted to the type parameters of d2 (link to generic methods), is a
     // subtype of R2.
-    ASSERT(r1->HasTypeFlag(TypeFlag::ETS_ARRAY_OR_OBJECT) || r1->IsETSTypeParameter());
+    ASSERT(r1->HasTypeFlag(TypeFlag::ETS_ARRAY_OR_OBJECT) || r1->IsETSTypeParameter() ||
+           r1->HasTypeFlag(TypeFlag::ETS_VOID));
     return Relation()->IsSupertypeOf(r2, r1);
 }
 
diff --git a/ets2panda/checker/ets/helpers.cpp b/ets2panda/checker/ets/helpers.cpp
index 1e1874cb65f9756fa443df322e06f6218b40bc31..c259fc2882f1a1012b320c7bde31d8d527a4eaae 100644
--- a/ets2panda/checker/ets/helpers.cpp
+++ b/ets2panda/checker/ets/helpers.cpp
@@ -81,7 +81,7 @@ void ETSChecker::CheckTruthinessOfType(ir::Expression *expr)
         ThrowTypeError("Condition must be of possible condition type", expr->Start());
     }
 
-    if (unboxedType == GlobalBuiltinVoidType() || unboxedType->IsETSVoidType()) {
+    if (unboxedType == GlobalVoidType() || unboxedType->IsETSVoidType()) {
         ThrowTypeError("An expression of type 'void' cannot be tested for truthiness", expr->Start());
     }
 
@@ -114,7 +114,7 @@ Type *ETSChecker::CreateNullishType(Type *type, checker::TypeFlag nullishFlags,
             nullish->AsETSObjectType()->SetAssemblerName(GlobalETSObjectType()->AssemblerName());
         }
     }
-    ASSERT(!nullish->HasTypeFlag(TypeFlag::ETS_PRIMITIVE));
+    ASSERT(!nullish->HasTypeFlag(TypeFlag::ETS_PRIMITIVE) || nullish->IsETSVoidType());
     return nullish;
 }
 
@@ -161,9 +161,13 @@ const Type *ETSChecker::GetNonNullishType(const Type *type) const
 Type *ETSChecker::CreateOptionalResultType(Type *type)
 {
     if (type->HasTypeFlag(checker::TypeFlag::ETS_PRIMITIVE)) {
-        type = PrimitiveTypeAsETSBuiltinType(type);
-        ASSERT(type->IsETSObjectType());
-        Relation()->GetNode()->AddBoxingUnboxingFlags(GetBoxingFlag(type));
+        if (type->IsETSVoidType()) {
+            type = GlobalETSUndefinedType();
+        } else {
+            type = PrimitiveTypeAsETSBuiltinType(type);
+            ASSERT(type->IsETSObjectType());
+            Relation()->GetNode()->AddBoxingUnboxingFlags(GetBoxingFlag(type));
+        }
     }
 
     return CreateNullishType(type, checker::TypeFlag::UNDEFINED, Allocator(), Relation(), GetGlobalTypesHolder());
diff --git a/ets2panda/checker/ets/typeCreation.cpp b/ets2panda/checker/ets/typeCreation.cpp
index bde29373c795b0d83ae9b4b559a3afe1f35560d0..8055a219a3399ea19ca8fb1762b2861e24e5cc47 100644
--- a/ets2panda/checker/ets/typeCreation.cpp
+++ b/ets2panda/checker/ets/typeCreation.cpp
@@ -232,7 +232,6 @@ std::map<util::StringView, GlobalTypeId> &GetNameToTypeIdMap()
         {compiler::Signatures::BUILTIN_LONG_BOX_CLASS, GlobalTypeId::ETS_LONG_BOX_BUILTIN},
         {compiler::Signatures::BUILTIN_FLOAT_BOX_CLASS, GlobalTypeId::ETS_FLOAT_BOX_BUILTIN},
         {compiler::Signatures::BUILTIN_DOUBLE_BOX_CLASS, GlobalTypeId::ETS_DOUBLE_BOX_BUILTIN},
-        {compiler::Signatures::BUILTIN_VOID_CLASS, GlobalTypeId::ETS_VOID_BUILTIN},
     };
 
     return nameToTypeId;
@@ -248,7 +247,6 @@ std::map<util::StringView, std::function<ETSObjectType *(const ETSChecker *)>> &
         {compiler::Signatures::BUILTIN_ERROR_CLASS, &ETSChecker::GlobalBuiltinErrorType},
         {compiler::Signatures::BUILTIN_TYPE_CLASS, &ETSChecker::GlobalBuiltinTypeType},
         {compiler::Signatures::BUILTIN_PROMISE_CLASS, &ETSChecker::GlobalBuiltinPromiseType},
-        {compiler::Signatures::BUILTIN_VOID_CLASS, &ETSChecker::GlobalBuiltinVoidType},
     };
 
     return nameToGlobalType;
diff --git a/ets2panda/checker/ets/typeRelationContext.cpp b/ets2panda/checker/ets/typeRelationContext.cpp
index 1e4197d98c4eed680bb1c3c0ed2480d708f0ee82..dc9ccaa3c22aeb8828be0a19199c3081ef8136d4 100644
--- a/ets2panda/checker/ets/typeRelationContext.cpp
+++ b/ets2panda/checker/ets/typeRelationContext.cpp
@@ -121,12 +121,17 @@ void InstantiationContext::InstantiateType(ETSObjectType *type, ir::TSTypeParame
 
             if (paramType->HasTypeFlag(TypeFlag::ETS_PRIMITIVE)) {
                 checker_->Relation()->SetNode(it);
+
                 auto *const boxedTypeArg = checker_->PrimitiveTypeAsETSBuiltinType(paramType);
                 ASSERT(boxedTypeArg);
                 paramType = boxedTypeArg->Instantiate(checker_->Allocator(), checker_->Relation(),
                                                       checker_->GetGlobalTypesHolder());
             }
 
+            if (paramType->IsETSVoidType()) {
+                paramType = checker_->GlobalETSUndefinedType();
+            }
+
             typeArgTypes.push_back(paramType);
         }
     }
diff --git a/ets2panda/checker/types/ets/etsObjectType.cpp b/ets2panda/checker/types/ets/etsObjectType.cpp
index 1c72ad3ff6b031cbbe573e809af322a97ef9c6f0..c83be3f00e5ed096c154917943c87c5c6750ac56 100644
--- a/ets2panda/checker/types/ets/etsObjectType.cpp
+++ b/ets2panda/checker/types/ets/etsObjectType.cpp
@@ -636,7 +636,7 @@ bool ETSObjectType::DefaultObjectTypeChecks(const ETSChecker *const etsChecker,
 
     if (!source->IsETSObjectType() ||
         !source->AsETSObjectType()->HasObjectFlag(ETSObjectFlags::CLASS | ETSObjectFlags::INTERFACE |
-                                                  ETSObjectFlags::NULL_TYPE)) {
+                                                  ETSObjectFlags::NULL_TYPE | ETSObjectFlags::UNDEFINED_TYPE)) {
         return true;
     }
 
diff --git a/ets2panda/checker/types/ets/etsVoidType.cpp b/ets2panda/checker/types/ets/etsVoidType.cpp
index 344b02d4180f716492e6924a32b8b017ac69c8cc..01e1255facd565d4567ae659799bafca8b9d9cfb 100644
--- a/ets2panda/checker/types/ets/etsVoidType.cpp
+++ b/ets2panda/checker/types/ets/etsVoidType.cpp
@@ -18,11 +18,22 @@
 namespace ark::es2panda::checker {
 void ETSVoidType::Identical(TypeRelation *relation, Type *other)
 {
-    if (other->IsETSVoidType()) {
+    if (other->IsETSVoidType() || other->IsETSUndefinedType()) {
         relation->Result(true);
     }
 }
 
+bool ETSVoidType::AssignmentSource(TypeRelation *relation, Type *target)
+{
+    Identical(relation, target);
+
+    if (target->ContainsUndefined()) {
+        relation->Result(true);
+    }
+
+    return relation->IsTrue();
+}
+
 void ETSVoidType::AssignmentTarget([[maybe_unused]] TypeRelation *relation, [[maybe_unused]] Type *source) {}
 
 Type *ETSVoidType::Instantiate([[maybe_unused]] ArenaAllocator *allocator, [[maybe_unused]] TypeRelation *relation,
diff --git a/ets2panda/checker/types/ets/etsVoidType.h b/ets2panda/checker/types/ets/etsVoidType.h
index f8d0975a7aa75b860f03f4da98c617c54b98129d..7f98a919fd76c92fbbe2c4ad570805ad1641417a 100644
--- a/ets2panda/checker/types/ets/etsVoidType.h
+++ b/ets2panda/checker/types/ets/etsVoidType.h
@@ -25,6 +25,7 @@ public:
 
     void Identical(TypeRelation *relation, Type *other) override;
     void AssignmentTarget(TypeRelation *relation, Type *source) override;
+    bool AssignmentSource(TypeRelation *relation, Type *target) override;
     Type *Instantiate(ArenaAllocator *allocator, TypeRelation *relation, GlobalTypesHolder *globalTypes) override;
 
     void ToString(std::stringstream &ss) const override
diff --git a/ets2panda/checker/types/globalTypesHolder.cpp b/ets2panda/checker/types/globalTypesHolder.cpp
index 8159ca6bf0e9bfd5fef17d18e5502d6af73c1aaf..f8de36a38af9648f3f8b5d9f130cf0a531161129 100644
--- a/ets2panda/checker/types/globalTypesHolder.cpp
+++ b/ets2panda/checker/types/globalTypesHolder.cpp
@@ -141,7 +141,6 @@ GlobalTypesHolder::GlobalTypesHolder(ArenaAllocator *allocator) : builtinNameMap
     builtinNameMappings_.emplace("LongBox", GlobalTypeId::ETS_LONG_BOX_BUILTIN);
     builtinNameMappings_.emplace("FloatBox", GlobalTypeId::ETS_FLOAT_BOX_BUILTIN);
     builtinNameMappings_.emplace("DoubleBox", GlobalTypeId::ETS_DOUBLE_BOX_BUILTIN);
-    builtinNameMappings_.emplace("void", GlobalTypeId::ETS_VOID_BUILTIN);
     builtinNameMappings_.emplace("never", GlobalTypeId::ETS_NEVER_BUILTIN);
 
     // ETS escompat layer
@@ -328,11 +327,6 @@ Type *GlobalTypesHolder::GlobalETSVoidType()
     return globalTypes_.at(static_cast<size_t>(GlobalTypeId::ETS_VOID));
 }
 
-Type *GlobalTypesHolder::GlobalBuiltinVoidType()
-{
-    return globalTypes_.at(static_cast<std::size_t>(GlobalTypeId::ETS_VOID_BUILTIN));
-}
-
 Type *GlobalTypesHolder::GlobalETSObjectType()
 {
     return globalTypes_.at(static_cast<size_t>(GlobalTypeId::ETS_OBJECT_BUILTIN));
diff --git a/ets2panda/checker/types/globalTypesHolder.h b/ets2panda/checker/types/globalTypesHolder.h
index 6dc0440d4c99a3d145b5c055ba24750cf43e9d88..ab0cdae7d95a8226186451384ca006f15504be86 100644
--- a/ets2panda/checker/types/globalTypesHolder.h
+++ b/ets2panda/checker/types/globalTypesHolder.h
@@ -53,7 +53,6 @@ enum class GlobalTypeId {
     ETS_BOOLEAN,
     ETS_STRING,
     ETS_VOID,
-    ETS_VOID_BUILTIN,
     ETS_OBJECT_BUILTIN,
     ETS_NULL,
     ETS_UNDEFINED,
@@ -128,7 +127,6 @@ public:
     Type *GlobalStringType();
     Type *GlobalBooleanType();
     Type *GlobalVoidType();
-    Type *GlobalBuiltinVoidType();
     Type *GlobalNullType();
     Type *GlobalUndefinedType();
     Type *GlobalUnknownType();
diff --git a/ets2panda/checker/types/typeFlag.h b/ets2panda/checker/types/typeFlag.h
index e071056e422e2101c4f46537a60597ad56d27a37..754c7790ecfdda42828b176d0b73fcca9d219b48 100644
--- a/ets2panda/checker/types/typeFlag.h
+++ b/ets2panda/checker/types/typeFlag.h
@@ -85,7 +85,7 @@ enum class TypeFlag : uint64_t {
     ETS_DYNAMIC_FUNCTION_TYPE = FUNCTION | ETS_DYNAMIC_FLAG,
     ETS_TYPE = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN | ETS_VOID | ETS_OBJECT | ETS_ARRAY |
                WILDCARD | ETS_TYPE_PARAMETER | ETS_ENUM | ETS_STRING_ENUM | ETS_DYNAMIC_TYPE | ETS_UNION,
-    ETS_PRIMITIVE = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN | ETS_VOID,
+    ETS_PRIMITIVE = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN,
     ETS_PRIMITIVE_RETURN = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN | ETS_ENUM,
     ETS_ARRAY_INDEX = BYTE | SHORT | INT,
     ETS_INTEGRAL = BYTE | CHAR | SHORT | INT | LONG,
diff --git a/ets2panda/compiler/core/ETSCompiler.cpp b/ets2panda/compiler/core/ETSCompiler.cpp
index 1cbdb9ff5456504c0760729abb133c3092f981fa..d30f8041523643803a5dece294cefefca3ddeffe 100644
--- a/ets2panda/compiler/core/ETSCompiler.cpp
+++ b/ets2panda/compiler/core/ETSCompiler.cpp
@@ -1633,29 +1633,35 @@ void ETSCompiler::Compile(const ir::ReturnStatement *st) const
 {
     ETSGen *etsg = GetETSGen();
     if (st->Argument() == nullptr) {
-        if (st->ReturnType() == nullptr || st->ReturnType()->IsETSVoidType()) {
-            if (etsg->ExtendWithFinalizer(st->parent_, st)) {
-                return;
-            }
-
-            if (etsg->CheckControlFlowChange()) {
-                etsg->ControlFlowChangeBreak();
-            }
-            etsg->EmitReturnVoid(st);
+        if (etsg->ExtendWithFinalizer(st->parent_, st)) {
             return;
         }
 
-        etsg->LoadBuiltinVoid(st);
-    } else {
-        auto ttctx = compiler::TargetTypeContext(etsg, etsg->ReturnType());
-
-        if (!etsg->TryLoadConstantExpression(st->Argument())) {
-            st->Argument()->Compile(etsg);
+        if (etsg->CheckControlFlowChange()) {
+            etsg->ControlFlowChangeBreak();
         }
-        etsg->ApplyConversion(st->Argument(), nullptr);
-        etsg->ApplyConversion(st->Argument(), st->ReturnType());
+
+        etsg->EmitReturnVoid(st);
+
+        return;
     }
 
+    if (st->Argument()->IsCallExpression() &&
+        st->Argument()->AsCallExpression()->Signature()->ReturnType()->IsETSVoidType()) {
+        st->Argument()->Compile(etsg);
+        etsg->EmitReturnVoid(st);
+        return;
+    }
+
+    auto ttctx = compiler::TargetTypeContext(etsg, etsg->ReturnType());
+
+    if (!etsg->TryLoadConstantExpression(st->Argument())) {
+        st->Argument()->Compile(etsg);
+    }
+
+    etsg->ApplyConversion(st->Argument(), nullptr);
+    etsg->ApplyConversion(st->Argument(), st->ReturnType());
+
     if (etsg->ExtendWithFinalizer(st->parent_, st)) {
         return;
     }
diff --git a/ets2panda/compiler/core/ETSGen.cpp b/ets2panda/compiler/core/ETSGen.cpp
index fab421d44ba22f17e175d20cbefe5b41cb136ced..1b4557fa294b717176275c5d31faff305e4ed2ed 100644
--- a/ets2panda/compiler/core/ETSGen.cpp
+++ b/ets2panda/compiler/core/ETSGen.cpp
@@ -41,6 +41,7 @@
 #include "checker/ETSchecker.h"
 #include "checker/ets/boxingConverter.h"
 #include "checker/types/ets/etsObjectType.h"
+#include "checker/types/ets/etsAsyncFuncReturnType.h"
 #include "checker/types/ets/types.h"
 #include "parser/program/program.h"
 
@@ -712,11 +713,20 @@ VReg ETSGen::GetThisReg() const
 
 void ETSGen::LoadDefaultValue([[maybe_unused]] const ir::AstNode *node, [[maybe_unused]] const checker::Type *type)
 {
+    if (type->IsETSAsyncFuncReturnType()) {
+        LoadDefaultValue(node, type->AsETSAsyncFuncReturnType()->GetPromiseTypeArg());
+        return;
+    }
+
     if (type->IsETSUnionType()) {
         type = Checker()->GetGlobalTypesHolder()->GlobalETSObjectType();
     }
     if (type->IsETSObjectType() || type->IsETSArrayType() || type->IsETSTypeParameter()) {
-        LoadAccumulatorNull(node, type);
+        if (type->IsETSUndefinedType()) {
+            LoadAccumulatorUndefined(node);
+        } else {
+            LoadAccumulatorNull(node, type);
+        }
     } else if (type->IsETSBooleanType()) {
         LoadAccumulatorBoolean(node, type->AsETSBooleanType()->GetValue());
     } else {
@@ -730,12 +740,6 @@ void ETSGen::EmitReturnVoid(const ir::AstNode *node)
     Sa().Emit<ReturnVoid>(node);
 }
 
-void ETSGen::LoadBuiltinVoid(const ir::AstNode *node)
-{
-    LoadStaticProperty(node, Checker()->GlobalBuiltinVoidType(),
-                       FormClassPropReference(Checker()->GlobalBuiltinVoidType(), "void_instance"));
-}
-
 void ETSGen::ReturnAcc(const ir::AstNode *node)
 {
     const auto *const accType = GetAccumulatorType();
@@ -839,10 +843,11 @@ void ETSGen::InternalCheckCast(const ir::AstNode *node, const es2panda::checker:
 
 void ETSGen::CheckedReferenceNarrowing(const ir::AstNode *node, const checker::Type *target)
 {
-    ASSERT(target->HasTypeFlag(TYPE_FLAG_BYTECODE_REF) && !target->IsETSNullLike());
+    ASSERT(target->HasTypeFlag(TYPE_FLAG_BYTECODE_REF));
+
     // NOTE(vpukhov): implement for nulllike and union targets
-    if (target == Checker()->GlobalETSNullishObjectType()) {
-        SetAccumulatorType(target);
+    if (target->IsETSNullLike()) {
+        EmitCheckCastToNullOrUndefined(node, target);
         return;
     }
 
@@ -2741,4 +2746,36 @@ util::StringView ETSGen::ToAssemblerType(const es2panda::checker::Type *type) co
     return util::UString(ss.str(), Allocator()).View();
 }
 
+void ETSGen::EmitCheckCastToNullOrUndefined(const ir::AstNode *node, const checker::Type *target)
+{
+    ASSERT(target->IsETSNullLike());
+
+    compiler::RegScope rs(this);
+    compiler::VReg res = AllocReg();
+
+    StoreAccumulator(node, res);
+
+    Label *ifTrue = AllocLabel();
+
+    if (target->IsETSNullType()) {
+        BranchIfNull(node, ifTrue);
+        LoadAccumulatorString(node, "Value cannot be casted to Null");
+    } else {
+        BranchIfUndefined(node, ifTrue);
+        LoadAccumulatorString(node, "Value cannot be casted to Undefined");
+    }
+
+    StoreAccumulator(node, res);
+
+    const auto error = AllocReg();
+    NewObject(node, error, compiler::Signatures::BUILTIN_CLASS_CAST_EXCEPTION);
+    CallThisStatic1(node, error, compiler::Signatures::BUILTIN_CLASS_CAST_EXCEPTION_CTOR, res);
+    EmitThrow(node, error);
+
+    SetLabel(node, ifTrue);
+
+    SetAccumulatorType(target);
+    LoadAccumulator(node, res);
+}
+
 }  // namespace ark::es2panda::compiler
diff --git a/ets2panda/compiler/core/ETSGen.h b/ets2panda/compiler/core/ETSGen.h
index 97c9d7ca3bdc523d2c48cd46011abe0d303caa47..d6de3a7c56810e82dbf6301f9457e504157d594c 100644
--- a/ets2panda/compiler/core/ETSGen.h
+++ b/ets2panda/compiler/core/ETSGen.h
@@ -88,7 +88,6 @@ public:
 
     void LoadDefaultValue(const ir::AstNode *node, const checker::Type *type);
     void EmitReturnVoid(const ir::AstNode *node);
-    void LoadBuiltinVoid(const ir::AstNode *node);
     void ReturnAcc(const ir::AstNode *node);
 
     void EmitIsInstance(const ir::AstNode *node, VReg objReg);
@@ -279,6 +278,26 @@ public:
         Sa().Emit<JeqzObj>(node, ifNull);
     }
 
+    void BranchIfUndefined([[maybe_unused]] const ir::AstNode *node, [[maybe_unused]] Label *ifUndefined)
+    {
+#ifdef PANDA_WITH_ETS
+        Sa().Emit<EtsIsundefined>(node);
+        Sa().Emit<Jnez>(node, ifUndefined);
+#else
+        UNREACHABLE();
+#endif  // PANDA_WITH_ETS
+    }
+
+    void BranchIfNotUndefined([[maybe_unused]] const ir::AstNode *node, [[maybe_unused]] Label *ifUndefined)
+    {
+#ifdef PANDA_WITH_ETS
+        Sa().Emit<EtsIsundefined>(node);
+        Sa().Emit<Jeqz>(node, ifUndefined);
+#else
+        UNREACHABLE();
+#endif  // PANDA_WITH_ETS
+    }
+
     void BranchIfNotNull(const ir::AstNode *node, Label *ifNotNull)
     {
         Sa().Emit<JnezObj>(node, ifNotNull);
@@ -666,6 +685,7 @@ private:
     const VReg dummyReg_ = VReg::RegStart();
 
     void EmitIsInstanceNonNullish(const ir::AstNode *node, VReg objReg, checker::ETSObjectType const *clsType);
+    void EmitCheckCastToNullOrUndefined(const ir::AstNode *node, const checker::Type *target);
     void EmitUnboxedCall(const ir::AstNode *node, std::string_view signatureFlag, const checker::Type *targetType,
                          const checker::Type *boxedType);
 
diff --git a/ets2panda/compiler/core/ETSfunction.cpp b/ets2panda/compiler/core/ETSfunction.cpp
index c264d09d5212dca6f3d8d14bd61383d4fa6f24c1..effca3433a432933143d13905ce431131abb35c4 100644
--- a/ets2panda/compiler/core/ETSfunction.cpp
+++ b/ets2panda/compiler/core/ETSfunction.cpp
@@ -57,68 +57,21 @@ void ETSFunction::CallImplicitCtor(ETSGen *etsg)
 
 void ETSFunction::CompileSourceBlock(ETSGen *etsg, const ir::BlockStatement *block)
 {
-    auto const checkInitializer = [](ArenaVector<ir::AstNode *> const &nodes) -> bool {
-        for (auto const *const node : nodes) {
-            if (node->IsMethodDefinition() && node->AsClassElement()->Key()->IsIdentifier()) {
-                if (node->AsClassElement()->Id()->Name() == compiler::Signatures::INIT_METHOD) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-
     auto *scriptFunc = etsg->RootNode()->AsScriptFunction();
 
     if (scriptFunc->IsEnum()) {
         // NOTE: add enum methods
     } else if (scriptFunc->IsStaticBlock()) {
-        const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition();
-
-        // Check if it is the Global class static constructor and the special '_$init$_" method exists
-        bool const compileInitializer = classDef->IsGlobal() ? checkInitializer(classDef->Body()) : true;
-
-        for (const auto *prop : classDef->Body()) {
-            if (!prop->IsClassProperty() || !prop->IsStatic()) {
-                continue;
-            }
-
-            // Don't compile variable initializers if they present in '_$init$_" method
-            auto *const item = prop->AsClassProperty();
-            auto *const value = item->Value();
-            if (value != nullptr && (compileInitializer || item->IsConst() || value->IsArrowFunctionExpression())) {
-                item->Compile(etsg);
-            }
-        }
+        CompileAsStaticBlock(etsg);
     } else if (scriptFunc->IsConstructor()) {
-        if (scriptFunc->IsImplicitSuperCallNeeded()) {
-            CallImplicitCtor(etsg);
-        }
-
-        const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition();
-
-        for (const auto *prop : classDef->Body()) {
-            if (!prop->IsClassProperty() || prop->IsStatic()) {
-                continue;
-            }
-
-            prop->AsClassProperty()->Compile(etsg);
-        }
+        CompileAsConstructor(etsg, scriptFunc);
     }
 
     const auto &statements = block->Statements();
 
     if (statements.empty()) {
         etsg->SetFirstStmt(block);
-        if (scriptFunc->IsConstructor() || scriptFunc->IsStaticBlock() || scriptFunc->IsEntryPoint()) {
-            ASSERT(etsg->ReturnType() != etsg->Checker()->GlobalBuiltinVoidType());
-            etsg->EmitReturnVoid(block);
-        } else {
-            ASSERT(!etsg->ReturnType()->IsETSVoidType());
-            etsg->LoadBuiltinVoid(block);
-            etsg->ReturnAcc(block);
-        }
-
+        ExtendWithDefaultReturn(etsg, block, scriptFunc);
         return;
     }
 
@@ -127,20 +80,69 @@ void ETSFunction::CompileSourceBlock(ETSGen *etsg, const ir::BlockStatement *blo
     etsg->CompileStatements(statements);
 
     if (!statements.back()->IsReturnStatement()) {
-        if (scriptFunc->IsConstructor() || scriptFunc->IsStaticBlock() || scriptFunc->IsEntryPoint()) {
-            ASSERT(etsg->ReturnType() != etsg->Checker()->GlobalBuiltinVoidType());
-            etsg->EmitReturnVoid(statements.back());
-            return;
+        ExtendWithDefaultReturn(etsg, statements.back(), scriptFunc);
+    }
+}
+
+void ETSFunction::ExtendWithDefaultReturn(ETSGen *etsg, const ir::AstNode *node, const ir::ScriptFunction *scriptFunc)
+{
+    if (etsg->ReturnType()->IsETSVoidType()) {
+        etsg->EmitReturnVoid(node);
+        return;
+    }
+
+    if (scriptFunc->ReturnTypeAnnotation() != nullptr && scriptFunc->ReturnTypeAnnotation()->TsType() != nullptr &&
+        scriptFunc->ReturnTypeAnnotation()->TsType()->IsETSAsyncFuncReturnType()) {
+        etsg->LoadDefaultValue(node, scriptFunc->ReturnTypeAnnotation()->TsType());
+    } else {
+        etsg->LoadDefaultValue(node, scriptFunc->Signature()->ReturnType());
+    }
+    etsg->ReturnAcc(node);
+}
+
+void ETSFunction::CompileAsStaticBlock(ETSGen *etsg)
+{
+    const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition();
+
+    auto const checkInitializer = [](ArenaVector<ir::AstNode *> const &nodes) -> bool {
+        for (auto const *const node : nodes) {
+            if (node->IsMethodDefinition() && node->AsClassElement()->Key()->IsIdentifier() &&
+                node->AsClassElement()->Id()->Name() == compiler::Signatures::INIT_METHOD) {
+                return false;
+            }
         }
+        return true;
+    };
+
+    // Check if it is the Global class static constructor and the special '_$init$_" method exists
+    bool const compileInitializer = classDef->IsGlobal() ? checkInitializer(classDef->Body()) : true;
+
+    for (const auto *prop : classDef->Body()) {
+        if (!prop->IsClassProperty() || !prop->IsStatic()) {
+            continue;
+        }
+
+        // Don't compile variable initializers if they present in '_$init$_" method
+        auto *const item = prop->AsClassProperty();
+        if (item->Value() != nullptr &&
+            (compileInitializer || item->IsConst() || item->Value()->IsArrowFunctionExpression())) {
+            item->Compile(etsg);
+        }
+    }
+}
+
+void ETSFunction::CompileAsConstructor(ETSGen *etsg, const ir::ScriptFunction *scriptFunc)
+{
+    if (scriptFunc->IsImplicitSuperCallNeeded()) {
+        CallImplicitCtor(etsg);
+    }
 
-        ASSERT(!etsg->ReturnType()->IsETSVoidType());
+    const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition();
 
-        if (scriptFunc->Signature()->ReturnType() == etsg->Checker()->GlobalBuiltinVoidType()) {
-            etsg->LoadBuiltinVoid(statements.back());
-        } else {
-            etsg->LoadDefaultValue(statements.back(), scriptFunc->Signature()->ReturnType());
+    for (const auto *prop : classDef->Body()) {
+        if (prop->IsClassProperty() && !prop->IsStatic()) {
+            prop->AsClassProperty()->Compile(etsg);
         }
-        etsg->ReturnAcc(statements.back());
     }
 }
 
diff --git a/ets2panda/compiler/core/ETSfunction.h b/ets2panda/compiler/core/ETSfunction.h
index 312ccea6a74e7987e588f3440f67e41c281ac141..edfbc5ea4c913758472680bcff230243e452978f 100644
--- a/ets2panda/compiler/core/ETSfunction.h
+++ b/ets2panda/compiler/core/ETSfunction.h
@@ -36,8 +36,11 @@ private:
     static void GenerateEnumMembers(ETSGen *etsg, const ir::AstNode *node, VReg arrayObj,
                                     const ir::TSEnumMember *enumMember, int32_t index);
     static void CompileSourceBlock(ETSGen *etsg, const ir::BlockStatement *block);
+    static void CompileAsStaticBlock(ETSGen *etsg);
+    static void CompileAsConstructor(ETSGen *etsg, const ir::ScriptFunction *scriptFunc);
     static void CompileFunction(ETSGen *etsg);
     static void CallImplicitCtor(ETSGen *etsg);
+    static void ExtendWithDefaultReturn(ETSGen *etsg, const ir::AstNode *node, const ir::ScriptFunction *scriptFunc);
 };
 }  // namespace ark::es2panda::compiler
 
diff --git a/ets2panda/compiler/core/dynamicContext.cpp b/ets2panda/compiler/core/dynamicContext.cpp
index d1d3179c841891e847728859f33b5b8b1fc66a29..b387ee4d7155b17cb0bff0372860abd6b3f0e8de 100644
--- a/ets2panda/compiler/core/dynamicContext.cpp
+++ b/ets2panda/compiler/core/dynamicContext.cpp
@@ -225,52 +225,7 @@ void ETSTryContext::EmitFinalizer(
     etsg->Branch(tryStmt_, finalizerTable->LabelSet().CatchEnd());
 
     for (std::pair<compiler::LabelPair, const ir::Statement *> insertion : finalizerInsertions) {
-        etsg->SetLabel(tryStmt_, insertion.first.Begin());
-
-        ASSERT(insertion.second != nullptr);
-        bool isReturn = insertion.second->IsReturnStatement();
-
-        compiler::RegScope rs(etsg);
-        compiler::VReg res = etsg->AllocReg();
-
-        if (isReturn) {
-            etsg->SetAccumulatorType(insertion.second->AsReturnStatement()->ReturnType());
-            etsg->StoreAccumulator(tryStmt_, res);
-            etsg->SetVRegType(res, insertion.second->AsReturnStatement()->ReturnType());
-        }
-
-        // Second compile of the finaly clause, executed if the statement executed normally, but abrupted by
-        // return, break, or continue statements.
-        tryStmt_->FinallyBlock()->Compile(etsg);
-
-        if (isReturn) {
-            etsg->SetAccumulatorType(insertion.second->AsReturnStatement()->ReturnType());
-            etsg->LoadAccumulator(tryStmt_, res);
-        }
-
-        if (insertion.first.End() != nullptr) {
-            etsg->Branch(tryStmt_, insertion.first.End());
-        } else if (isReturn) {
-            if (etsg->CheckControlFlowChange()) {
-                etsg->StoreAccumulator(tryStmt_, res);
-                etsg->ControlFlowChangeBreak();
-                etsg->LoadAccumulator(tryStmt_, res);
-            }
-
-            if (insertion.second->AsReturnStatement()->ReturnType()->IsETSVoidType()) {
-                etsg->EmitReturnVoid(tryStmt_);
-            } else {
-                etsg->ReturnAcc(tryStmt_);
-            }
-        } else if (insertion.second->IsBreakStatement()) {
-            compiler::Label *target = etsg->ControlFlowChangeBreak(insertion.second->AsBreakStatement()->Ident());
-            etsg->Branch(tryStmt_, target);
-        } else if (insertion.second->IsContinueStatement()) {
-            compiler::Label *target = etsg->ControlFlowChangeContinue(insertion.second->AsContinueStatement()->Ident());
-            etsg->Branch(tryStmt_, target);
-        } else {
-            UNREACHABLE();
-        }
+        EmitFinalizerInsertion(etsg, insertion.first, insertion.second);
     }
 
     etsg->SetLabel(tryStmt_, finalizerTable->LabelSet().CatchBegin());
@@ -285,4 +240,50 @@ void ETSTryContext::EmitFinalizer(
     etsg->SetLabel(tryStmt_, finalizerTable->LabelSet().CatchEnd());
 }
 
+void ETSTryContext::EmitFinalizerInsertion(ETSGen *etsg, compiler::LabelPair labelPair, const ir::Statement *statement)
+{
+    etsg->SetLabel(tryStmt_, labelPair.Begin());
+
+    ASSERT(statement != nullptr);
+    bool isReturn = statement->IsReturnStatement();
+
+    compiler::RegScope rs(etsg);
+    compiler::VReg res = etsg->AllocReg();
+
+    if (isReturn) {
+        etsg->SetAccumulatorType(statement->AsReturnStatement()->ReturnType());
+        etsg->StoreAccumulator(tryStmt_, res);
+        etsg->SetVRegType(res, statement->AsReturnStatement()->ReturnType());
+    }
+
+    // Second compile of the finaly clause, executed if the statement executed normally, but abrupted by
+    // return, break, or continue statements.
+    tryStmt_->FinallyBlock()->Compile(etsg);
+
+    if (isReturn) {
+        etsg->SetAccumulatorType(statement->AsReturnStatement()->ReturnType());
+        etsg->LoadAccumulator(tryStmt_, res);
+    }
+
+    if (labelPair.End() != nullptr) {
+        etsg->Branch(tryStmt_, labelPair.End());
+    } else if (isReturn) {
+        if (etsg->CheckControlFlowChange()) {
+            etsg->StoreAccumulator(tryStmt_, res);
+            etsg->ControlFlowChangeBreak();
+            etsg->LoadAccumulator(tryStmt_, res);
+        }
+
+        etsg->ReturnAcc(tryStmt_);
+    } else if (statement->IsBreakStatement()) {
+        compiler::Label *target = etsg->ControlFlowChangeBreak(statement->AsBreakStatement()->Ident());
+        etsg->Branch(tryStmt_, target);
+    } else if (statement->IsContinueStatement()) {
+        compiler::Label *target = etsg->ControlFlowChangeContinue(statement->AsContinueStatement()->Ident());
+        etsg->Branch(tryStmt_, target);
+    } else {
+        UNREACHABLE();
+    }
+}
+
 }  // namespace ark::es2panda::compiler
diff --git a/ets2panda/compiler/core/dynamicContext.h b/ets2panda/compiler/core/dynamicContext.h
index 4216c348beb3f915a23aa8a6b2fad50589c30dbe..9e9f156adea085d4a7182d62ab413798f1870780 100644
--- a/ets2panda/compiler/core/dynamicContext.h
+++ b/ets2panda/compiler/core/dynamicContext.h
@@ -287,6 +287,7 @@ public:
 
     void EmitFinalizer(LabelPair trycatchLabelPair,
                        const ArenaVector<std::pair<compiler::LabelPair, const ir::Statement *>> &finalizerInsertions);
+    void EmitFinalizerInsertion(ETSGen *etsg, compiler::LabelPair labelPair, const ir::Statement *statement);
 
 private:
     const ir::TryStatement *tryStmt_ {};
diff --git a/ets2panda/compiler/lowering/ets/lambdaLowering.cpp b/ets2panda/compiler/lowering/ets/lambdaLowering.cpp
index cb8cf507c3dd9fa325ba57f6f9b159069a77b269..d3eae59018cdfbcc47dc6239f13dafbfbe802b67 100644
--- a/ets2panda/compiler/lowering/ets/lambdaLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/lambdaLowering.cpp
@@ -27,13 +27,21 @@ static ir::AstNode *ConvertExpression(checker::ETSChecker *const checker, ir::Ar
     auto *const expr = function->Body()->AsExpression();
 
     ArenaVector<ir::Statement *> statements(checker->Allocator()->Adapter());
-    statements.emplace_back(checker->AllocNode<ir::ReturnStatement>(expr));
+
+    if ((function->ReturnTypeAnnotation() != nullptr && function->ReturnTypeAnnotation()->IsETSPrimitiveType() &&
+         function->ReturnTypeAnnotation()->AsETSPrimitiveType()->GetPrimitiveType() == ir::PrimitiveType::VOID)) {
+        statements.emplace_back(checker->AllocNode<ir::ExpressionStatement>(expr));
+    } else {
+        statements.emplace_back(checker->AllocNode<ir::ReturnStatement>(expr));
+        function->AddFlag(ir::ScriptFunctionFlags::HAS_RETURN);
+    }
+
     auto *const block = checker->AllocNode<ir::BlockStatement>(checker->Allocator(), std::move(statements));
+
     block->SetScope(scope);
     block->SetParent(function);
 
     function->SetBody(block);
-    function->AddFlag(ir::ScriptFunctionFlags::HAS_RETURN);
 
     return arrow;
 }
diff --git a/ets2panda/compiler/lowering/ets/promiseVoid.cpp b/ets2panda/compiler/lowering/ets/promiseVoid.cpp
index 990d0183cc122ac42699842ee1efb34320a8fc55..be6913e87c639fd169c65c1ee6e98c1eea404519 100644
--- a/ets2panda/compiler/lowering/ets/promiseVoid.cpp
+++ b/ets2panda/compiler/lowering/ets/promiseVoid.cpp
@@ -41,7 +41,7 @@ static ir::BlockStatement *HandleAsyncScriptFunctionBody(checker::ETSChecker *ch
             const auto *arg = returnStmt->Argument();
             if (arg == nullptr) {
                 auto *voidId =
-                    checker->AllocNode<ir::Identifier>(compiler::Signatures::VOID_OBJECT, checker->Allocator());
+                    checker->AllocNode<ir::Identifier>(compiler::Signatures::UNDEFINED, checker->Allocator());
                 const auto &returnLoc = returnStmt->Range();
                 voidId->SetRange({returnLoc.end, returnLoc.end});
                 returnStmt->SetArgument(voidId);
@@ -65,8 +65,7 @@ static ir::TypeNode *CreatePromiseVoidType(checker::ETSChecker *checker, const l
 {
     auto *voidParam = [checker]() {
         auto paramsVector = ArenaVector<ir::TypeNode *>(checker->Allocator()->Adapter());
-        auto *voidId =
-            checker->AllocNode<ir::Identifier>(compiler::Signatures::BUILTIN_VOID_CLASS, checker->Allocator());
+        auto *voidId = checker->AllocNode<ir::Identifier>(compiler::Signatures::UNDEFINED, checker->Allocator());
         voidId->SetReference();
         auto *part = checker->AllocNode<ir::ETSTypeReferencePart>(voidId);
         paramsVector.push_back(checker->AllocNode<ir::ETSTypeReference>(part));
@@ -117,7 +116,7 @@ static bool CheckForPromiseVoid(const ir::TypeNode *type)
     }
 
     const auto isTypePromise = typePart->Name()->AsIdentifier()->Name() == compiler::Signatures::BUILTIN_PROMISE_CLASS;
-    const auto isParamVoid = paramPart->Name()->AsIdentifier()->Name() == compiler::Signatures::BUILTIN_VOID_CLASS;
+    const auto isParamVoid = paramPart->Name()->AsIdentifier()->Name() == compiler::Signatures::UNDEFINED;
 
     return isTypePromise && isParamVoid;
 }
@@ -206,9 +205,7 @@ bool PromiseVoidInferencePhase::Postcondition(public_lib::Context *ctx, const pa
         }
 
         const auto *id = arg->AsIdentifier();
-        return id->Name() == compiler::Signatures::VOID_OBJECT;
-
-        return true;
+        return id->Name() == compiler::Signatures::UNDEFINED;
     };
 
     auto isOk = true;
diff --git a/ets2panda/compiler/scripts/signatures.yaml b/ets2panda/compiler/scripts/signatures.yaml
index c0797950622c2fd8f0b8e17cf44e2c24bc607b68..ac689b30bdaa79467047f8f9dd0b35efce4ba6fe 100644
--- a/ets2panda/compiler/scripts/signatures.yaml
+++ b/ets2panda/compiler/scripts/signatures.yaml
@@ -118,8 +118,10 @@ defines:
     ref: STATIC_INVOKE_METHOD
   - name: instantiate
     ref: STATIC_INSTANTIATE_METHOD
-  - name: Void
-    ref: VOID_OBJECT
+  - name: undefined
+    ref: UNDEFINED
+  - name: 'null'
+    ref: NULL_LITERAL
 
 packages:
   - name: 'std.core'
@@ -203,9 +205,6 @@ builtins:
   - name: Object
     package: PKG_STD_CORE
     ref: BUILTIN_OBJECT
-  - name: void
-    package: PKG_STD_CORE
-    ref: BUILTIN_VOID
   - name: String
     package: PKG_STD_CORE
     ref: BUILTIN_STRING
@@ -845,61 +844,61 @@ signatures:
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyBoolean
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_BOOLEAN]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_BOOLEAN
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyByte
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_BYTE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_BYTE
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyChar
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_CHAR]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_CHAR
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyShort
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_SHORT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_SHORT
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyInt
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_INT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_INT
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyLong
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_LONG]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_LONG
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyFloat
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_FLOAT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_FLOAT
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyDouble
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_DOUBLE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_DOUBLE
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyString
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, BUILTIN_STRING]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_STRING
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setPropertyJSValue
     params: [BUILTIN_JSVALUE, BUILTIN_STRING, BUILTIN_JSVALUE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_PROPERTY_JSVALUE
 
   - callee: BUILTIN_PROMISE
@@ -967,67 +966,67 @@ signatures:
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementBoolean
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_BOOLEAN]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_BOOLEAN
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementByte
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_BYTE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_BYTE
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementChar
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_CHAR]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_CHAR
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementShort
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_SHORT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_SHORT
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementInt
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_INT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_INT
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementLong
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_LONG]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_LONG
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementFloat
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_FLOAT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_FLOAT
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementDouble
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_DOUBLE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_DOUBLE
 
   - callee: BUILTIN_JSRUNTIME
     method_name: setElementJSValue
     params: [BUILTIN_JSVALUE, PRIMITIVE_INT, BUILTIN_JSVALUE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_SET_ELEMENT_JSVALUE
 
   - callee: BUILTIN_JSRUNTIME
     method_name: __initJSCallClass
     params: [BUILTIN_STRING]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_INIT_DYNAMIC_CALL_CLASS
 
   - callee: BUILTIN_JSRUNTIME
     method_name: __initJSNewClass
     params: [BUILTIN_STRING]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_INIT_DYNAMIC_NEW_CLASS
 
   - callee: BUILTIN_JSRUNTIME
@@ -1039,7 +1038,7 @@ signatures:
   - callee: BUILTIN_JSRUNTIME
     method_name: loadModule
     params: [BUILTIN_STRING]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_JSRUNTIME_LOAD_MODULE
 
   - callee: BUILTIN_JSRUNTIME
@@ -1075,7 +1074,7 @@ signatures:
   - callee: BUILTIN_BOX
     method_name: set
     params: [BUILTIN_OBJECT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_BOX_SET
 
   - callee: BUILTIN_BOOLEAN_BOX
@@ -1093,7 +1092,7 @@ signatures:
   - callee: BUILTIN_BOOLEAN_BOX
     method_name: set
     params: [PRIMITIVE_BOOLEAN]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_BOOLEAN_BOX_SET
 
   - callee: BUILTIN_BYTE_BOX
@@ -1111,7 +1110,7 @@ signatures:
   - callee: BUILTIN_BYTE_BOX
     method_name: set
     params: [PRIMITIVE_BYTE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_BYTE_BOX_SET
 
   - callee: BUILTIN_CHAR_BOX
@@ -1129,7 +1128,7 @@ signatures:
   - callee: BUILTIN_CHAR_BOX
     method_name: set
     params: [PRIMITIVE_CHAR]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_CHAR_BOX_SET
 
   - callee: BUILTIN_SHORT_BOX
@@ -1147,7 +1146,7 @@ signatures:
   - callee: BUILTIN_SHORT_BOX
     method_name: set
     params: [PRIMITIVE_SHORT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_SHORT_BOX_SET
 
   - callee: BUILTIN_INT_BOX
@@ -1165,7 +1164,7 @@ signatures:
   - callee: BUILTIN_INT_BOX
     method_name: set
     params: [PRIMITIVE_INT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_INT_BOX_SET
 
   - callee: BUILTIN_LONG_BOX
@@ -1183,7 +1182,7 @@ signatures:
   - callee: BUILTIN_LONG_BOX
     method_name: set
     params: [PRIMITIVE_LONG]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_LONG_BOX_SET
 
   - callee: BUILTIN_FLOAT_BOX
@@ -1201,7 +1200,7 @@ signatures:
   - callee: BUILTIN_FLOAT_BOX
     method_name: set
     params: [PRIMITIVE_FLOAT]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_FLOAT_BOX_SET
 
   - callee: BUILTIN_DOUBLE_BOX
@@ -1219,7 +1218,7 @@ signatures:
   - callee: BUILTIN_DOUBLE_BOX
     method_name: set
     params: [PRIMITIVE_DOUBLE]
-    return_type: BUILTIN_VOID
+    return_type: PRIMITIVE_VOID
     ref: BUILTIN_DOUBLE_BOX_SET
 
   - callee: BUILTIN_JSRUNTIME
diff --git a/ets2panda/ir/ets/etsPrimitiveType.cpp b/ets2panda/ir/ets/etsPrimitiveType.cpp
index 736f5bcd92bd5442d3cf306c6e185203b1888d92..b26cf4f46f90548406badfa32eb8c5ae48353db3 100644
--- a/ets2panda/ir/ets/etsPrimitiveType.cpp
+++ b/ets2panda/ir/ets/etsPrimitiveType.cpp
@@ -126,6 +126,10 @@ checker::Type *ETSPrimitiveType::GetType([[maybe_unused]] checker::ETSChecker *c
             SetTsType(checker->GlobalCharType());
             return TsType();
         }
+        case PrimitiveType::VOID: {
+            SetTsType(checker->GlobalVoidType());
+            return TsType();
+        }
         default: {
             UNREACHABLE();
         }
diff --git a/ets2panda/ir/ets/etsTypeReferencePart.cpp b/ets2panda/ir/ets/etsTypeReferencePart.cpp
index b79c49ae58144befd4694beb1064b7fad22ba878..d6f1354b811d2571ba85d785eb6b06a016e62476 100644
--- a/ets2panda/ir/ets/etsTypeReferencePart.cpp
+++ b/ets2panda/ir/ets/etsTypeReferencePart.cpp
@@ -90,9 +90,18 @@ checker::Type *ETSTypeReferencePart::Check(checker::ETSChecker *checker)
 checker::Type *ETSTypeReferencePart::GetType(checker::ETSChecker *checker)
 {
     if (prev_ == nullptr) {
-        if ((name_->IsIdentifier()) && (name_->AsIdentifier()->Variable() != nullptr) &&
-            (name_->AsIdentifier()->Variable()->Declaration()->IsTypeAliasDecl())) {
-            return checker->HandleTypeAlias(name_, typeParams_);
+        if (name_->IsIdentifier()) {
+            if ((name_->AsIdentifier()->Variable() != nullptr) &&
+                (name_->AsIdentifier()->Variable()->Declaration()->IsTypeAliasDecl())) {
+                return checker->HandleTypeAlias(name_, typeParams_);
+            }
+            if (name_->AsIdentifier()->Name() == compiler::Signatures::UNDEFINED) {
+                return checker->GlobalETSUndefinedType();
+            }
+
+            if (name_->AsIdentifier()->Name() == compiler::Signatures::NULL_LITERAL) {
+                return checker->GlobalETSNullType();
+            }
         }
 
         checker::Type *baseType = checker->GetReferencedTypeBase(name_);
diff --git a/ets2panda/lexer/scripts/keywords.yaml b/ets2panda/lexer/scripts/keywords.yaml
index e89b4ed2fbacc97170b3ec976760fa75755940e7..9a09b235cdba3291b7deafa52cecfb5d6e11dea4 100644
--- a/ets2panda/lexer/scripts/keywords.yaml
+++ b/ets2panda/lexer/scripts/keywords.yaml
@@ -476,6 +476,7 @@ keywords:
   - name: 'void'
     token: KEYW_VOID
     keyword: [as, js, ts]
+    keyword_like: [ets]
 
   - name: 'while'
     token: KEYW_WHILE
diff --git a/ets2panda/lexer/token/token.cpp b/ets2panda/lexer/token/token.cpp
index 218f76987a9549947fff23d361b917d7268f9a6e..9fd44ee81fd0b8133392ae6c7a2ad8d4b10fc806 100644
--- a/ets2panda/lexer/token/token.cpp
+++ b/ets2panda/lexer/token/token.cpp
@@ -113,6 +113,7 @@ bool Token::IsDefinableTypeName() const
         case TokenType::KEYW_STRING:
         case TokenType::KEYW_NUMBER:
         case TokenType::KEYW_BIGINT:
+        case TokenType::KEYW_VOID:
             return true;
         default:
             return false;
diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp
index a8f79c4290ab313e3d3ff644d9d46cd367bc4e64..6c7fd22c29d132e96e749440744fc9c0389b79e9 100644
--- a/ets2panda/parser/ETSparser.cpp
+++ b/ets2panda/parser/ETSparser.cpp
@@ -2559,6 +2559,34 @@ std::tuple<ir::Expression *, ir::TSTypeParameterInstantiation *> ETSParser::Pars
     return {typeName, typeParamInst};
 }
 
+ir::TypeNode *ETSParser::ParseNullUndefinedAsTypeAnnotation(TypeAnnotationParsingOptions *options)
+{
+    ir::Expression *expr = AllocNode<ir::Identifier>(Lexer()->GetToken().Ident(), Allocator());
+    expr->AsIdentifier()->SetReference();
+    expr->SetRange(Lexer()->GetToken().Loc());
+
+    auto *typeRefPart = AllocNode<ir::ETSTypeReferencePart>(expr, nullptr, nullptr);
+
+    auto *typeReference = AllocNode<ir::ETSTypeReference>(typeRefPart);
+    typeReference->SetRange({Lexer()->GetToken().Start(), Lexer()->GetToken().End()});
+
+    auto nullishFlag = Lexer()->GetToken().Type() == lexer::TokenType::LITERAL_NULL
+                           ? ir::ModifierFlags::NULL_ASSIGNABLE
+                           : ir::ModifierFlags::UNDEFINED_ASSIGNABLE;
+
+    ir::TypeNode *typeAnnotation = typeReference;
+
+    Lexer()->NextToken();
+    if (((*options) & TypeAnnotationParsingOptions::DISALLOW_UNION) == 0 &&
+        Lexer()->GetToken().Type() == lexer::TokenType::PUNCTUATOR_BITWISE_OR) {
+        Lexer()->NextToken();
+        typeAnnotation = ParseTypeAnnotation(options);
+    }
+
+    typeAnnotation->AddModifier(nullishFlag);
+    return typeAnnotation;
+}
+
 ir::TypeNode *ETSParser::ParseTypeReference(TypeAnnotationParsingOptions *options)
 {
     auto startPos = Lexer()->GetToken().Start();
@@ -2736,6 +2764,9 @@ ir::TypeNode *ETSParser::GetTypeAnnotationOfPrimitiveType([[maybe_unused]] lexer
         case lexer::TokenType::KEYW_LONG:
             typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::LONG);
             break;
+        case lexer::TokenType::KEYW_VOID:
+            typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::VOID);
+            break;
         default:
             typeAnnotation = ParseTypeReference(options);
             break;
@@ -2871,6 +2902,15 @@ std::pair<ir::TypeNode *, bool> ETSParser::GetTypeAnnotationFromToken(TypeAnnota
             }
             break;
         }
+        case lexer::TokenType::KEYW_VOID: {
+            typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::VOID);
+            break;
+        }
+        case lexer::TokenType::LITERAL_NULL:
+        case lexer::TokenType::KEYW_UNDEFINED: {
+            typeAnnotation = ParseNullUndefinedAsTypeAnnotation(options);
+            break;
+        }
         case lexer::TokenType::KEYW_BOOLEAN: {
             typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::BOOLEAN);
             break;
diff --git a/ets2panda/parser/ETSparser.h b/ets2panda/parser/ETSparser.h
index e835291f8df35eae3f571fc11ce85471f896aa3e..951cbab0525a62c2230e0105158dfea4889dfe7d 100644
--- a/ets2panda/parser/ETSparser.h
+++ b/ets2panda/parser/ETSparser.h
@@ -184,6 +184,7 @@ private:
                                                    ir::TypeNode *typeAnnotation);
     std::tuple<ir::Expression *, ir::TSTypeParameterInstantiation *> ParseTypeReferencePart(
         TypeAnnotationParsingOptions *options);
+    ir::TypeNode *ParseNullUndefinedAsTypeAnnotation(TypeAnnotationParsingOptions *options);
     ir::TypeNode *ParseTypeReference(TypeAnnotationParsingOptions *options);
     ir::TypeNode *ParseBaseTypeReference(TypeAnnotationParsingOptions *options);
     ir::TypeNode *ParsePrimitiveType(TypeAnnotationParsingOptions *options, ir::PrimitiveType type);
diff --git a/ets2panda/test/compiler/ets/FunctionType1-expected.txt b/ets2panda/test/compiler/ets/FunctionType1-expected.txt
index eb64020f40e49445ed82f79f28fa02782d538428..198d23dd26911a06d684707093505201432a5049 100644
--- a/ets2panda/test/compiler/ets/FunctionType1-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType1-expected.txt
@@ -539,35 +539,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 34
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 30
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 35
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 16,
@@ -575,7 +547,7 @@
                   },
                   "end": {
                     "line": 16,
-                    "column": 35
+                    "column": 34
                   }
                 }
               },
@@ -586,7 +558,7 @@
                 },
                 "end": {
                   "line": 16,
-                  "column": 35
+                  "column": 34
                 }
               }
             },
@@ -599,7 +571,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 35
+                "column": 34
               }
             }
           },
@@ -649,35 +621,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -685,7 +629,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/FunctionType2-expected.txt b/ets2panda/test/compiler/ets/FunctionType2-expected.txt
index 1dcaa7ce18cad300834afa778966c9f4f1368547..cebe23057494adb23435f41baa98e0be27725693 100644
--- a/ets2panda/test/compiler/ets/FunctionType2-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType2-expected.txt
@@ -447,35 +447,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 48
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 52
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 48
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 54
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -483,7 +455,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 54
+                      "column": 52
                     }
                   }
                 },
@@ -582,35 +554,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -618,7 +562,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/FunctionType3-expected.txt b/ets2panda/test/compiler/ets/FunctionType3-expected.txt
index bbb4c6e27b15eea2054e80a1da9798db1abe9305..ff2007a48381ca79f03a46775e21b7d7c4101a7c 100644
--- a/ets2panda/test/compiler/ets/FunctionType3-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType3-expected.txt
@@ -226,35 +226,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 35
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 31
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 36
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 16,
@@ -262,7 +234,7 @@
                   },
                   "end": {
                     "line": 16,
-                    "column": 36
+                    "column": 35
                   }
                 }
               },
@@ -273,7 +245,7 @@
                 },
                 "end": {
                   "line": 16,
-                  "column": 36
+                  "column": 35
                 }
               }
             },
@@ -286,7 +258,7 @@
               },
               "end": {
                 "line": 16,
-                "column": 36
+                "column": 35
               }
             }
           },
@@ -422,35 +394,7 @@
                     }
                   ],
                   "returnType": {
-                    "type": "ETSTypeReference",
-                    "part": {
-                      "type": "ETSTypeReferencePart",
-                      "name": {
-                        "type": "Identifier",
-                        "name": "void",
-                        "decorators": [],
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 39
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 43
-                          }
-                        }
-                      },
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 39
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 45
-                        }
-                      }
-                    },
+                    "type": "ETSPrimitiveType",
                     "loc": {
                       "start": {
                         "line": 18,
@@ -458,7 +402,7 @@
                       },
                       "end": {
                         "line": 18,
-                        "column": 45
+                        "column": 43
                       }
                     }
                   },
@@ -469,7 +413,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 45
+                      "column": 43
                     }
                   }
                 },
@@ -597,35 +541,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -633,7 +549,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/FunctionType4-expected.txt b/ets2panda/test/compiler/ets/FunctionType4-expected.txt
index 8927a880696633a15427e3a077bcfc4fde64e7e0..fc04e6d7dbb8d3580ad792561cc5b3e1cdfc4b36 100644
--- a/ets2panda/test/compiler/ets/FunctionType4-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType4-expected.txt
@@ -790,35 +790,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -826,7 +798,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/FunctionType6-expected.txt b/ets2panda/test/compiler/ets/FunctionType6-expected.txt
index 909ce83c37a295537bee3d4ca6896fb2f6b23d13..8f3f78412159f614545a7ff88743d1cc835dbe4d 100644
--- a/ets2panda/test/compiler/ets/FunctionType6-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType6-expected.txt
@@ -110,35 +110,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -146,7 +118,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/FunctionType7-expected.txt b/ets2panda/test/compiler/ets/FunctionType7-expected.txt
index f249b8d2014108d1895c1f2d55675250565e3f50..7da21e6c03db76890a108086e03d8fb6ff142049 100644
--- a/ets2panda/test/compiler/ets/FunctionType7-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType7-expected.txt
@@ -110,35 +110,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -146,7 +118,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
@@ -476,35 +448,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -512,7 +456,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/FunctionType8-expected.txt b/ets2panda/test/compiler/ets/FunctionType8-expected.txt
index 246720088183d754f5cd838c8689bdd222ac527a..899a7907595650b43802b0ad3f2742e721d879c4 100644
--- a/ets2panda/test/compiler/ets/FunctionType8-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType8-expected.txt
@@ -151,35 +151,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -187,7 +159,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -393,35 +365,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 31
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 22,
-                      "column": 27
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 33
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 22,
@@ -429,7 +373,7 @@
                   },
                   "end": {
                     "line": 22,
-                    "column": 33
+                    "column": 31
                   }
                 }
               },
@@ -440,7 +384,7 @@
                 },
                 "end": {
                   "line": 22,
-                  "column": 33
+                  "column": 31
                 }
               }
             },
@@ -722,35 +666,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -758,7 +674,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
@@ -923,35 +839,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 23
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 30,
-                      "column": 19
-                    },
-                    "end": {
-                      "line": 30,
-                      "column": 25
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 30,
@@ -959,7 +847,7 @@
                   },
                   "end": {
                     "line": 30,
-                    "column": 25
+                    "column": 23
                   }
                 }
               },
@@ -970,7 +858,7 @@
                 },
                 "end": {
                   "line": 30,
-                  "column": 25
+                  "column": 23
                 }
               }
             },
@@ -1264,35 +1152,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 33,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 33,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 33,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 33,
@@ -1300,7 +1160,7 @@
                     },
                     "end": {
                       "line": 33,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/FunctionType9-expected.txt b/ets2panda/test/compiler/ets/FunctionType9-expected.txt
index e6dafbd1aedc0b5c985c1960af18a070f203de10..89ae3bf0cf0b37a3ff9ac1e2ee4ca3dc0e86d6f7 100644
--- a/ets2panda/test/compiler/ets/FunctionType9-expected.txt
+++ b/ets2panda/test/compiler/ets/FunctionType9-expected.txt
@@ -110,35 +110,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -146,7 +118,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
@@ -283,35 +255,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 31
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 22,
-                      "column": 27
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 33
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 22,
@@ -319,7 +263,7 @@
                   },
                   "end": {
                     "line": 22,
-                    "column": 33
+                    "column": 31
                   }
                 }
               },
@@ -330,7 +274,7 @@
                 },
                 "end": {
                   "line": 22,
-                  "column": 33
+                  "column": 31
                 }
               }
             },
@@ -624,35 +568,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -660,7 +576,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/StructTest1-expected.txt b/ets2panda/test/compiler/ets/StructTest1-expected.txt
index 50b26e476663ff7fed5b30f4c80a94562f4b5271..591b083f381a7baf8793df10ca27fe09a3206a6f 100644
--- a/ets2panda/test/compiler/ets/StructTest1-expected.txt
+++ b/ets2panda/test/compiler/ets/StructTest1-expected.txt
@@ -949,35 +949,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -985,7 +957,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/StructTest2-expected.txt b/ets2panda/test/compiler/ets/StructTest2-expected.txt
index 5e9b0511ba87bcf0eed5836f040fb28a52ed588d..10873cd404f8f7319a17cbb2b9302303d84c6364 100644
--- a/ets2panda/test/compiler/ets/StructTest2-expected.txt
+++ b/ets2panda/test/compiler/ets/StructTest2-expected.txt
@@ -1034,35 +1034,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -1070,7 +1042,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt
index 6410ff6e469f369ee27da6a0212b3df34e21ed7d..d6f185f73fa06f41af4a7f147dd23ec245aac93c 100644
--- a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt
+++ b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt
@@ -205,35 +205,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -241,7 +213,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -560,35 +532,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 36
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -596,7 +540,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 36
+                      "column": 35
                     }
                   }
                 },
@@ -723,35 +667,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -759,7 +675,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
@@ -1242,35 +1158,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 34,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 34,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 34,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 34,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 34,
@@ -1278,7 +1166,7 @@
                     },
                     "end": {
                       "line": 34,
-                      "column": 34
+                      "column": 33
                     }
                   }
                 },
@@ -1290,7 +1178,7 @@
                   },
                   "end": {
                     "line": 34,
-                    "column": 34
+                    "column": 33
                   }
                 }
               },
@@ -1301,7 +1189,7 @@
                 },
                 "end": {
                   "line": 34,
-                  "column": 34
+                  "column": 33
                 }
               }
             },
@@ -1466,35 +1354,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 38,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 38,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 38,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 38,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 38,
@@ -1502,7 +1362,7 @@
                     },
                     "end": {
                       "line": 38,
-                      "column": 33
+                      "column": 32
                     }
                   }
                 },
@@ -1629,35 +1489,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 39,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 39,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 39,
@@ -1665,7 +1497,7 @@
                     },
                     "end": {
                       "line": 39,
-                      "column": 24
+                      "column": 23
                     }
                   }
                 },
@@ -2024,35 +1856,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 45,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 45,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 45,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 45,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 45,
@@ -2060,7 +1864,7 @@
                     },
                     "end": {
                       "line": 45,
-                      "column": 34
+                      "column": 33
                     }
                   }
                 },
@@ -2322,35 +2126,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 51,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 51,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 51,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 51,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 51,
@@ -2358,7 +2134,7 @@
                     },
                     "end": {
                       "line": 51,
-                      "column": 24
+                      "column": 23
                     }
                   }
                 },
@@ -2370,7 +2146,7 @@
                   },
                   "end": {
                     "line": 51,
-                    "column": 24
+                    "column": 23
                   }
                 }
               },
@@ -2381,7 +2157,7 @@
                 },
                 "end": {
                   "line": 51,
-                  "column": 24
+                  "column": 23
                 }
               }
             },
@@ -2695,35 +2471,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 55,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 55,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 55,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 55,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 55,
@@ -2731,7 +2479,7 @@
                     },
                     "end": {
                       "line": 55,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt
index d2a660f61fd80d3a31797928ad2fc5a706b667fd..6ec840ffe76b013a8e5679828eb1aae4405ef102 100644
--- a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt
+++ b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 26
+                      "column": 25
                     }
                   }
                 },
@@ -583,35 +555,7 @@
                         "expression": false,
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 26,
-                                  "column": 25
-                                },
-                                "end": {
-                                  "line": 26,
-                                  "column": 29
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 26,
-                                "column": 25
-                              },
-                              "end": {
-                                "line": 26,
-                                "column": 31
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 26,
@@ -619,7 +563,7 @@
                             },
                             "end": {
                               "line": 26,
-                              "column": 31
+                              "column": 29
                             }
                           }
                         },
diff --git a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt
index 59ec00952669a82247d1341862a0579f1f01cf2d..f5299a0b136bf517ad05ce85c94ec5cf80cf40c2 100644
--- a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt
+++ b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 17
+                      "column": 16
                     }
                   }
                 },
@@ -245,35 +217,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -281,7 +225,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 23
                     }
                   }
                 },
@@ -342,35 +286,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 32
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 36
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 32
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 38
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 19,
@@ -378,7 +294,7 @@
                                   },
                                   "end": {
                                     "line": 19,
-                                    "column": 38
+                                    "column": 36
                                   }
                                 }
                               },
@@ -389,7 +305,7 @@
                                 },
                                 "end": {
                                   "line": 19,
-                                  "column": 38
+                                  "column": 36
                                 }
                               }
                             },
@@ -457,35 +373,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 50
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 54
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 50
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 57
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 19,
@@ -493,7 +381,7 @@
                                   },
                                   "end": {
                                     "line": 19,
-                                    "column": 57
+                                    "column": 54
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/boxingConversion1-expected.txt b/ets2panda/test/compiler/ets/boxingConversion1-expected.txt
index bf84cbaee199b297dbaec22105b8ab791df6c2b3..243da03902da96f410e659fbdfb7550db8a541f9 100644
--- a/ets2panda/test/compiler/ets/boxingConversion1-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion1-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt
index 910dc2a60eb85b57587dc8a9b57baea955d34236..eb781cd47de2402b86b8742611b2f16519fe247a 100644
--- a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt
index a018b02b0bf026f7b8058c536e5f619691cb3825..95995a8168818826786f36ad062d09733188a02e 100644
--- a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt
@@ -204,35 +204,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -240,7 +212,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 33
+                      "column": 31
                     }
                   }
                 },
@@ -601,35 +573,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -637,7 +581,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/boxingConversion4-expected.txt b/ets2panda/test/compiler/ets/boxingConversion4-expected.txt
index f102d6aa27c85fb79d5b97699a0f41fad8aa433a..350be7c55e6626ff721fc8b58148bb6017ba8ce4 100644
--- a/ets2panda/test/compiler/ets/boxingConversion4-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingConversion4-expected.txt
@@ -232,35 +232,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -268,7 +240,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
@@ -367,35 +339,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -403,7 +347,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt
index 8d1bfab3969455db0c856ca3927489eb8f7137e3..2d9aac6a3e1fa70dc9de2029ca75908a93232855 100644
--- a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt
+++ b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 17
+                      "column": 16
                     }
                   }
                 },
@@ -2568,35 +2540,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 42,
-                          "column": 35
-                        },
-                        "end": {
-                          "line": 42,
-                          "column": 39
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 42,
-                        "column": 35
-                      },
-                      "end": {
-                        "line": 42,
-                        "column": 41
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 42,
@@ -2604,7 +2548,7 @@
                     },
                     "end": {
                       "line": 42,
-                      "column": 41
+                      "column": 39
                     }
                   }
                 },
@@ -2773,35 +2717,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 43,
-                          "column": 35
-                        },
-                        "end": {
-                          "line": 43,
-                          "column": 39
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 43,
-                        "column": 35
-                      },
-                      "end": {
-                        "line": 43,
-                        "column": 41
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 43,
@@ -2809,7 +2725,7 @@
                     },
                     "end": {
                       "line": 43,
-                      "column": 41
+                      "column": 39
                     }
                   }
                 },
@@ -2950,35 +2866,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 44,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 44,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 44,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 44,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 44,
@@ -2986,7 +2874,7 @@
                     },
                     "end": {
                       "line": 44,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -3155,35 +3043,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 45,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 45,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 45,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 45,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 45,
@@ -3191,7 +3051,7 @@
                     },
                     "end": {
                       "line": 45,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -3332,35 +3192,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 46,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 46,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 46,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 46,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 46,
@@ -3368,7 +3200,7 @@
                     },
                     "end": {
                       "line": 46,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -3537,35 +3369,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 47,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 47,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 47,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 47,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 47,
@@ -3573,7 +3377,7 @@
                     },
                     "end": {
                       "line": 47,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -3714,35 +3518,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 48,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 48,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 48,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 48,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 48,
@@ -3750,7 +3526,7 @@
                     },
                     "end": {
                       "line": 48,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -3919,35 +3695,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 49,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 49,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 49,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 49,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 49,
@@ -3955,7 +3703,7 @@
                     },
                     "end": {
                       "line": 49,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -4096,35 +3844,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 50,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 50,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 50,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 50,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 50,
@@ -4132,7 +3852,7 @@
                     },
                     "end": {
                       "line": 50,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -4301,35 +4021,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 51,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 51,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 51,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 51,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 51,
@@ -4337,7 +4029,7 @@
                     },
                     "end": {
                       "line": 51,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -4478,35 +4170,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 52,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 52,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 52,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 52,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 52,
@@ -4514,7 +4178,7 @@
                     },
                     "end": {
                       "line": 52,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -4683,35 +4347,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 53,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 53,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 53,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 53,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 53,
@@ -4719,7 +4355,7 @@
                     },
                     "end": {
                       "line": 53,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -4860,35 +4496,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 54,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 54,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 54,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 54,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 54,
@@ -4896,7 +4504,7 @@
                     },
                     "end": {
                       "line": 54,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -5065,35 +4673,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 55,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 55,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 55,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 55,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 55,
@@ -5101,7 +4681,7 @@
                     },
                     "end": {
                       "line": 55,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -5242,35 +4822,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 56,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 56,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 56,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 56,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 56,
@@ -5278,7 +4830,7 @@
                     },
                     "end": {
                       "line": 56,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -5447,35 +4999,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 57,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 57,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 57,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 57,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 57,
@@ -5483,7 +5007,7 @@
                     },
                     "end": {
                       "line": 57,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -5582,35 +5106,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 59,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 59,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 59,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 59,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 59,
@@ -5618,7 +5114,7 @@
                     },
                     "end": {
                       "line": 59,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt
index 0e009bbbadcfd08d7846db4db6eaf9a85581ba7f..c08235ad17e49b306063e7e22ec7ce745644835a 100644
--- a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt
+++ b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt
@@ -205,35 +205,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -241,7 +213,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 18
+                      "column": 16
                     }
                   }
                 },
@@ -571,35 +543,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -607,7 +551,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/catchParamScope-expected.txt b/ets2panda/test/compiler/ets/catchParamScope-expected.txt
index 76eb7133ca55b20dbb12035eb638616ce07a03a2..482075c4b5c7e5328c494ecf8560acc608ed7d75 100644
--- a/ets2panda/test/compiler/ets/catchParamScope-expected.txt
+++ b/ets2panda/test/compiler/ets/catchParamScope-expected.txt
@@ -232,35 +232,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -268,7 +240,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -367,35 +339,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -403,7 +347,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -422,35 +366,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 19
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 23
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 19
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 25
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 20,
@@ -458,7 +374,7 @@
                                   },
                                   "end": {
                                     "line": 20,
-                                    "column": 25
+                                    "column": 23
                                   }
                                 }
                               },
@@ -469,7 +385,7 @@
                                 },
                                 "end": {
                                   "line": 20,
-                                  "column": 25
+                                  "column": 23
                                 }
                               }
                             },
@@ -495,35 +411,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 30
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 34
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 30
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 37
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 20,
@@ -531,7 +419,7 @@
                                   },
                                   "end": {
                                     "line": 20,
-                                    "column": 37
+                                    "column": 34
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt
index 29be34d68b1ce950c3ad2a00c3f804a40934614a..db7fce781e0e6bdcd5e55a7453d12162f1effc09 100644
--- a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt b/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt
index b4bf32c6330f22320bace84b0c62e0c4b4964444..ed428dd340eac217785a49b933cad42aff8e7a3a 100644
--- a/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt b/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt
index 34209cbf2af7545dc5c20fa866881148d308108c..8fb5fafeb254441bef6e6f5b189f68f1cb4f02a4 100644
--- a/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt
@@ -594,35 +594,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -630,7 +602,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt b/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt
index af949c270615157730027a99372a76c77a20769b..50e5de56a88b48482cebc8baee56a815bc44a26d 100644
--- a/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt b/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt
index b811e85e80afc6aa1975fd6ebcad1bf8fe5e7f9c..0bbc7d401bf7dc7524f987b93d356bdbdb749dd8 100644
--- a/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt
@@ -326,35 +326,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -362,7 +334,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt
index aa6b186a07899d43d3ce39ed8a6b9ce3dbe7c0a5..6aa13d2cd9bda01aae9f96420e9b91ddf4b9bbea 100644
--- a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt
@@ -3378,35 +3378,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 76,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 76,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 76,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 76,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 76,
@@ -3414,7 +3386,7 @@
                     },
                     "end": {
                       "line": 76,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt b/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt
index 9e783ed31020193db7f6aae4fc20f48c13e99ddb..2a4e55b60d439b31eac4016e258acd4aa23b66b4 100644
--- a/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt
+++ b/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt
@@ -469,35 +469,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 80,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 80,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 80,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 80,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 80,
@@ -505,7 +477,7 @@
                     },
                     "end": {
                       "line": 80,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/forUpdate-expected.txt b/ets2panda/test/compiler/ets/forUpdate-expected.txt
index ac8cf73a20fd697d2ae0e5cf9d0d016ba3241569..d5967be06ed6d10d69cdd61003b044d76e40a05a 100644
--- a/ets2panda/test/compiler/ets/forUpdate-expected.txt
+++ b/ets2panda/test/compiler/ets/forUpdate-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt
index f7d82fe267ef9da2331a52e0467afbd6e48f8610..842beaa2d92fb88267cf52606169cbf6f2b816d3 100644
--- a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt
+++ b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt b/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt
index e2347bad084c1a78e4c09c379c4d19a1109714dd..134fb9bdd56809e0195e580e69f8276a06bf2e44 100644
--- a/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt
+++ b/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt
@@ -159,35 +159,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -195,7 +167,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
@@ -829,35 +801,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -865,7 +809,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt
index 3bbcd11e33ef65d1560400dab4ba7a68d1dc9f59..5ceff9ec7fd4ba86373b5edea5d638b046b1a71b 100644
--- a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt
+++ b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt
@@ -311,35 +311,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 19
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -347,7 +319,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 19
+                      "column": 17
                     }
                   }
                 },
@@ -677,35 +649,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -713,7 +657,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt
index b4fdc70d8e2b653c8a89fdaa764fae6a134ba43a..1ca8f28043381d67a4c78b79deaebd5b92823906 100644
--- a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt
+++ b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt
@@ -261,35 +261,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -297,7 +269,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 33
+                      "column": 31
                     }
                   }
                 },
@@ -396,35 +368,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -432,7 +376,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -493,35 +437,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 21,
-                                        "column": 31
-                                      },
-                                      "end": {
-                                        "line": 21,
-                                        "column": 35
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 21,
-                                      "column": 31
-                                    },
-                                    "end": {
-                                      "line": 21,
-                                      "column": 37
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 21,
@@ -529,7 +445,7 @@
                                   },
                                   "end": {
                                     "line": 21,
-                                    "column": 37
+                                    "column": 35
                                   }
                                 }
                               },
@@ -540,7 +456,7 @@
                                 },
                                 "end": {
                                   "line": 21,
-                                  "column": 37
+                                  "column": 35
                                 }
                               }
                             },
diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt
index c57f16ebaf253ac6a11435a994eb214df2262891..c384a09df25b99d47ab6a0b0a8e7b4b60e31849e 100644
--- a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt
+++ b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt
@@ -399,35 +399,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -435,7 +407,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt
index 5e31d540789e5bee03ff1da52c85d071c5e7d49a..1f361300c34cf4697b417622b1a2c5b0d5253012 100644
--- a/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt
+++ b/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt
@@ -376,35 +376,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -412,7 +384,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt
index ad7907de18e22201fc9f859c8fecc70d918d6243..dbddfece6043a3f8dad6b455309964f32dd18e3c 100644
--- a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt
+++ b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt
@@ -22,35 +22,7 @@
         "type": "ETSFunctionType",
         "params": [],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 24
-                },
-                "end": {
-                  "line": 16,
-                  "column": 28
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 24
-              },
-              "end": {
-                "line": 16,
-                "column": 29
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
@@ -58,7 +30,7 @@
             },
             "end": {
               "line": 16,
-              "column": 29
+              "column": 28
             }
           }
         },
@@ -69,7 +41,7 @@
           },
           "end": {
             "line": 16,
-            "column": 29
+            "column": 28
           }
         }
       },
@@ -245,35 +217,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -281,7 +225,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -642,35 +586,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -678,7 +594,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt
index 9ab44f07043c42b7d82e1474a23805efa5a721f7..2003cc8a840fdd607c5dccb6c4dda4b8cf236cdc 100644
--- a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt
+++ b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt
@@ -447,35 +447,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 19
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 23
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 19
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 25
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 20,
@@ -483,7 +455,7 @@
                                   },
                                   "end": {
                                     "line": 20,
-                                    "column": 25
+                                    "column": 23
                                   }
                                 }
                               },
@@ -494,7 +466,7 @@
                                 },
                                 "end": {
                                   "line": 20,
-                                  "column": 25
+                                  "column": 23
                                 }
                               }
                             },
@@ -644,35 +616,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 21,
-                                        "column": 34
-                                      },
-                                      "end": {
-                                        "line": 21,
-                                        "column": 38
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 21,
-                                      "column": 34
-                                    },
-                                    "end": {
-                                      "line": 21,
-                                      "column": 40
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 21,
@@ -680,7 +624,7 @@
                                   },
                                   "end": {
                                     "line": 21,
-                                    "column": 40
+                                    "column": 38
                                   }
                                 }
                               },
@@ -691,7 +635,7 @@
                                 },
                                 "end": {
                                   "line": 21,
-                                  "column": 40
+                                  "column": 38
                                 }
                               }
                             },
diff --git a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt
index 426576fd85849a298c4f58b43c1357fa07867b15..cd6a3e5bb4f0bc3eb2d3cb703090f5dbbdfc3a31 100644
--- a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt
@@ -122,35 +122,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -158,7 +130,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 27
+                      "column": 26
                     }
                   }
                 },
@@ -170,7 +142,7 @@
                   },
                   "end": {
                     "line": 20,
-                    "column": 27
+                    "column": 26
                   }
                 }
               },
@@ -181,7 +153,7 @@
                 },
                 "end": {
                   "line": 20,
-                  "column": 27
+                  "column": 26
                 }
               }
             },
@@ -436,35 +408,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -472,7 +416,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 26
+                      "column": 25
                     }
                   }
                 },
@@ -484,7 +428,7 @@
                   },
                   "end": {
                     "line": 22,
-                    "column": 26
+                    "column": 25
                   }
                 }
               },
@@ -495,7 +439,7 @@
                 },
                 "end": {
                   "line": 22,
-                  "column": 26
+                  "column": 25
                 }
               }
             },
@@ -3656,35 +3600,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 49
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 53
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 39,
-                        "column": 49
-                      },
-                      "end": {
-                        "line": 39,
-                        "column": 55
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 39,
@@ -3692,7 +3608,7 @@
                     },
                     "end": {
                       "line": 39,
-                      "column": 55
+                      "column": 53
                     }
                   }
                 },
@@ -5017,35 +4933,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 58,
-                          "column": 36
-                        },
-                        "end": {
-                          "line": 58,
-                          "column": 40
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 58,
-                        "column": 36
-                      },
-                      "end": {
-                        "line": 58,
-                        "column": 42
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 58,
@@ -5053,7 +4941,7 @@
                     },
                     "end": {
                       "line": 58,
-                      "column": 42
+                      "column": 40
                     }
                   }
                 },
@@ -6408,35 +6296,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 79,
-                          "column": 38
-                        },
-                        "end": {
-                          "line": 79,
-                          "column": 42
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 79,
-                        "column": 38
-                      },
-                      "end": {
-                        "line": 79,
-                        "column": 44
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 79,
@@ -6444,7 +6304,7 @@
                     },
                     "end": {
                       "line": 79,
-                      "column": 44
+                      "column": 42
                     }
                   }
                 },
@@ -8598,35 +8458,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 102,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 102,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 102,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 102,
-                        "column": 43
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 102,
@@ -8634,7 +8466,7 @@
                     },
                     "end": {
                       "line": 102,
-                      "column": 43
+                      "column": 41
                     }
                   }
                 },
@@ -17741,35 +17573,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 203,
-                          "column": 97
-                        },
-                        "end": {
-                          "line": 203,
-                          "column": 101
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 203,
-                        "column": 97
-                      },
-                      "end": {
-                        "line": 203,
-                        "column": 103
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 203,
@@ -17777,7 +17581,7 @@
                     },
                     "end": {
                       "line": 203,
-                      "column": 103
+                      "column": 101
                     }
                   }
                 },
@@ -19987,35 +19791,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 225,
-                          "column": 99
-                        },
-                        "end": {
-                          "line": 225,
-                          "column": 103
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 225,
-                        "column": 99
-                      },
-                      "end": {
-                        "line": 225,
-                        "column": 105
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 225,
@@ -20023,7 +19799,7 @@
                     },
                     "end": {
                       "line": 225,
-                      "column": 105
+                      "column": 103
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt
index aa42a0148543ad8df365f9c4a7caf62cc49624cd..efe229c1d50178143ae9737c00dc5d98b460294c 100644
--- a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt
@@ -332,35 +332,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 27
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 31
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 27
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 33
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 18,
@@ -368,7 +340,7 @@
                         },
                         "end": {
                           "line": 18,
-                          "column": 33
+                          "column": 31
                         }
                       }
                     },
@@ -711,35 +683,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -747,7 +691,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt
index 13ab0857acc6fdd10912031d1af0c2a4edf4ae74..e09761843566bbbf501eecc438f3ef84f4b4c243 100644
--- a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt
@@ -915,35 +915,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -951,7 +923,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt
index 3f59e363d568115c3e39c33e1033eb0db7b36a67..e649c890a5c3501987cf53ce3ef39c68a23f234c 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt
@@ -506,35 +506,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -542,7 +514,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt
index 40b5c23fb504e7bd63203d5913b052865f4f643b..729713e216a90d21000875d580f0b2bd798bf0c1 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt
@@ -643,35 +643,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -679,7 +651,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt
index 9202914ca8a324e538c0732ea3b1c989125eee6b..dae3a96db752166f14d548485a83a9375f14e9eb 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt
@@ -683,35 +683,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -719,7 +691,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt
index 73ff374fd495e7702940a4e17f701faf49a0fa2b..e4431c97704431a6476dc88678259ae13a832342 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt
@@ -1677,35 +1677,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -1713,7 +1685,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt
index 42dbbefc7b1b9fc2284ff47ae8905ac98c15f221..df5c348a72bcd8ecade0e65dfa839c9c4430d740 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt
@@ -197,35 +197,7 @@
                                   }
                                 ],
                                 "returnType": {
-                                  "type": "ETSTypeReference",
-                                  "part": {
-                                    "type": "ETSTypeReferencePart",
-                                    "name": {
-                                      "type": "Identifier",
-                                      "name": "void",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 17,
-                                          "column": 51
-                                        },
-                                        "end": {
-                                          "line": 17,
-                                          "column": 55
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 17,
-                                        "column": 51
-                                      },
-                                      "end": {
-                                        "line": 17,
-                                        "column": 56
-                                      }
-                                    }
-                                  },
+                                  "type": "ETSPrimitiveType",
                                   "loc": {
                                     "start": {
                                       "line": 17,
@@ -233,7 +205,7 @@
                                     },
                                     "end": {
                                       "line": 17,
-                                      "column": 56
+                                      "column": 55
                                     }
                                   }
                                 },
@@ -244,7 +216,7 @@
                                   },
                                   "end": {
                                     "line": 17,
-                                    "column": 56
+                                    "column": 55
                                   }
                                 }
                               },
@@ -256,7 +228,7 @@
                                 },
                                 "end": {
                                   "line": 17,
-                                  "column": 56
+                                  "column": 55
                                 }
                               }
                             },
@@ -267,41 +239,13 @@
                               },
                               "end": {
                                 "line": 17,
-                                "column": 56
+                                "column": 55
                               }
                             }
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 60
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 64
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 60
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 71
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -309,7 +253,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 71
+                              "column": 64
                             }
                           }
                         }
@@ -321,7 +265,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 71
+                            "column": 64
                           }
                         }
                       },
@@ -333,7 +277,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 71
+                          "column": 64
                         }
                       }
                     },
@@ -344,7 +288,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 71
+                        "column": 64
                       }
                     }
                   }
@@ -948,35 +892,7 @@
                                         }
                                       ],
                                       "returnType": {
-                                        "type": "ETSTypeReference",
-                                        "part": {
-                                          "type": "ETSTypeReferencePart",
-                                          "name": {
-                                            "type": "Identifier",
-                                            "name": "void",
-                                            "decorators": [],
-                                            "loc": {
-                                              "start": {
-                                                "line": 24,
-                                                "column": 53
-                                              },
-                                              "end": {
-                                                "line": 24,
-                                                "column": 57
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 24,
-                                              "column": 53
-                                            },
-                                            "end": {
-                                              "line": 24,
-                                              "column": 58
-                                            }
-                                          }
-                                        },
+                                        "type": "ETSPrimitiveType",
                                         "loc": {
                                           "start": {
                                             "line": 24,
@@ -984,7 +900,7 @@
                                           },
                                           "end": {
                                             "line": 24,
-                                            "column": 58
+                                            "column": 57
                                           }
                                         }
                                       },
@@ -995,7 +911,7 @@
                                         },
                                         "end": {
                                           "line": 24,
-                                          "column": 58
+                                          "column": 57
                                         }
                                       }
                                     },
@@ -1007,7 +923,7 @@
                                       },
                                       "end": {
                                         "line": 24,
-                                        "column": 58
+                                        "column": 57
                                       }
                                     }
                                   },
@@ -1018,41 +934,13 @@
                                     },
                                     "end": {
                                       "line": 24,
-                                      "column": 58
+                                      "column": 57
                                     }
                                   }
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 24,
-                                        "column": 60
-                                      },
-                                      "end": {
-                                        "line": 24,
-                                        "column": 64
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 24,
-                                      "column": 60
-                                    },
-                                    "end": {
-                                      "line": 24,
-                                      "column": 67
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 24,
@@ -1060,7 +948,7 @@
                                   },
                                   "end": {
                                     "line": 24,
-                                    "column": 67
+                                    "column": 64
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt
index ee92a4e9315364ac9dcaa2453c12b37e75a7db01..7706d9d16dc5f59ff8d0eb24e7eab049e34deb6b 100644
--- a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt
@@ -439,35 +439,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -475,7 +447,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt
index 8e27fca50e52a27a436916192b7d203d452ff282..d9c188072b7f3f0e57460b427ab5ee51ce96dd72 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt
@@ -691,35 +691,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -727,7 +699,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt
index b62ce00490f13c3191c860dfeb858d221c3a3011..5ea41e878f01bff3555debdecc52c85779dbe9d7 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt
@@ -274,35 +274,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -310,7 +282,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt
index b02e59012d8634d2bfb18179f19afa773259a016..b867e8eff96eadde517fdeb2c22fe5483bd7171a 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt
@@ -231,35 +231,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -267,7 +239,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt
index 9be51ba2887128e736de285cfb0145b36ecd2ec9..d45b98d6990de4a19229280580662b5f607a549e 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt
@@ -274,35 +274,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -310,7 +282,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt
index 3d97f850663b3a0eed891d3aa696a2bdf0b30373..0f0cea59cf9345e71277eef6105e2d5973e36dd7 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt
@@ -744,35 +744,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -780,7 +752,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt
index 116b3cb4838b497c6bf4dd76b0d8390437de18a9..956de2330f346f64479a3eec8a70363c63d2ff4b 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt
@@ -607,35 +607,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -643,7 +615,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt
index cb253be2b733cdd791e0636924eaffda9871d709..ac7857c8a3bce05a5c678a04254e3fad3d29bb9f 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt
@@ -274,35 +274,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -310,7 +282,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt
index c91e3d2dd93bda4b7202072176519bf453412979..4a416ed51f4adfc07b841f171f8913d84c678a76 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt
@@ -411,35 +411,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -447,7 +419,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt
index 12338275bc22d8a74203fb7e584897e31d0a6ff7..425f798ad63f80edbc099918c709d921617766c1 100644
--- a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt
+++ b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt
@@ -330,35 +330,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -366,7 +338,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt b/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt
index 8c18f48d2d53e1b85e1adde629d867cf5b4b6376..743d0838fa6e7a2c18c6d98985db9c6421116455 100644
--- a/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt
@@ -1917,35 +1917,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 39,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 39,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 39,
@@ -1953,7 +1925,7 @@
                     },
                     "end": {
                       "line": 39,
-                      "column": 27
+                      "column": 26
                     }
                   }
                 },
@@ -1965,7 +1937,7 @@
                   },
                   "end": {
                     "line": 39,
-                    "column": 27
+                    "column": 26
                   }
                 }
               },
@@ -1976,7 +1948,7 @@
                 },
                 "end": {
                   "line": 39,
-                  "column": 27
+                  "column": 26
                 }
               }
             },
@@ -2231,35 +2203,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 41,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 41,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 41,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 41,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 41,
@@ -2267,7 +2211,7 @@
                     },
                     "end": {
                       "line": 41,
-                      "column": 26
+                      "column": 25
                     }
                   }
                 },
@@ -2279,7 +2223,7 @@
                   },
                   "end": {
                     "line": 41,
-                    "column": 26
+                    "column": 25
                   }
                 }
               },
@@ -2290,7 +2234,7 @@
                 },
                 "end": {
                   "line": 41,
-                  "column": 26
+                  "column": 25
                 }
               }
             },
@@ -6084,35 +6028,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 61,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 61,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 61,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 61,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 61,
@@ -6120,7 +6036,7 @@
                     },
                     "end": {
                       "line": 61,
-                      "column": 18
+                      "column": 17
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt
index 7fc151e937e61413c69e749ea19af03abe4988d6..1a4800f27367a6e7be753f1b4b340dc94de36092 100644
--- a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt
@@ -159,35 +159,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 49
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 53
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 49
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 54
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 22,
@@ -195,7 +167,7 @@
                             },
                             "end": {
                               "line": 22,
-                              "column": 54
+                              "column": 53
                             }
                           }
                         },
@@ -206,7 +178,7 @@
                           },
                           "end": {
                             "line": 22,
-                            "column": 54
+                            "column": 53
                           }
                         }
                       },
@@ -218,7 +190,7 @@
                         },
                         "end": {
                           "line": 22,
-                          "column": 54
+                          "column": 53
                         }
                       }
                     },
@@ -229,7 +201,7 @@
                       },
                       "end": {
                         "line": 22,
-                        "column": 54
+                        "column": 53
                       }
                     }
                   }
@@ -650,35 +622,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 28,
-                                  "column": 52
-                                },
-                                "end": {
-                                  "line": 28,
-                                  "column": 56
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 28,
-                                "column": 52
-                              },
-                              "end": {
-                                "line": 28,
-                                "column": 57
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 28,
@@ -686,7 +630,7 @@
                             },
                             "end": {
                               "line": 28,
-                              "column": 57
+                              "column": 56
                             }
                           }
                         },
@@ -697,7 +641,7 @@
                           },
                           "end": {
                             "line": 28,
-                            "column": 57
+                            "column": 56
                           }
                         }
                       },
@@ -709,7 +653,7 @@
                         },
                         "end": {
                           "line": 28,
-                          "column": 57
+                          "column": 56
                         }
                       }
                     },
@@ -720,7 +664,7 @@
                       },
                       "end": {
                         "line": 28,
-                        "column": 57
+                        "column": 56
                       }
                     }
                   }
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt
index 826c0e80a2a5d3a8bdbdc04ccce1745a3cf8cedc..fa0eef0c2838a5fcae7402706c572bff24d0fc3c 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt
@@ -628,35 +628,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -664,7 +636,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -1073,35 +1045,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -1109,7 +1053,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt
index 2e60845699d3825ea362f56d7c1df654d0fdef7b..0abf3a0ff438ccd886e74dd4093de658b6c5bdab 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt
@@ -1425,35 +1425,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 34,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 34,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 34,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 34,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 34,
@@ -1461,7 +1433,7 @@
                     },
                     "end": {
                       "line": 34,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt
index 7e2cc15cd5c677cd66d232c6269f98681c1f245c..757b511447bd11725f24df836c17194d92bcb295 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt
@@ -222,35 +222,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -258,7 +230,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt
index 58ac0be4cfac4fecd88f525982db39725aebebcf..db5bb1d7412ddfc6739145a25cf066ba52d7691b 100644
--- a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt
@@ -2364,35 +2364,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 44,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 44,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 44,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 44,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 44,
@@ -2400,7 +2372,7 @@
                     },
                     "end": {
                       "line": 44,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt
index 618aaf0ee73a60ef27168d8fd50d945a3e917aa8..366732cf5eed2f14951418d231a1f7d127fee52b 100644
--- a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt
@@ -122,35 +122,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -158,7 +130,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
@@ -170,7 +142,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 22
+                    "column": 21
                   }
                 }
               },
@@ -181,7 +153,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 22
+                  "column": 21
                 }
               }
             },
@@ -564,35 +536,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -600,7 +544,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 18
+                      "column": 16
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt b/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt
index beeda0916cc791e793dba090353c106ce47b51ef..617fe539c2d3c2bca5291271eb2724750e6a356e 100644
--- a/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt
@@ -524,35 +524,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -560,7 +532,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -659,35 +631,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -695,7 +639,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt
index 6fac876a48b7a60228347e682731066be9d7d6ec..2ba95b46d84bedc5d28154811d19a98465f34095 100644
--- a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt
@@ -419,35 +419,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -455,7 +427,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt
index cb01550c5cf92886f01e6485b96d5516e3b1b69c..f7ef7e3ec70109598a1c159bc54f706b3e33cb54 100644
--- a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt
+++ b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt
@@ -556,35 +556,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -592,7 +564,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference10-expected.txt b/ets2panda/test/compiler/ets/identifierReference10-expected.txt
index ac3b7839e92d595485903d934a4c5eae2ef3e233..aba0da58979a03b6b732cabca5f7f86836e16576 100644
--- a/ets2panda/test/compiler/ets/identifierReference10-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference10-expected.txt
@@ -400,35 +400,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -436,7 +408,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference11-expected.txt b/ets2panda/test/compiler/ets/identifierReference11-expected.txt
index f0d601241052dc6a836894ef9b0cd87f1863b571..1365fa17d6dc6919388340a1d1222071d83e7322 100644
--- a/ets2panda/test/compiler/ets/identifierReference11-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference11-expected.txt
@@ -268,35 +268,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -304,7 +276,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference12-expected.txt b/ets2panda/test/compiler/ets/identifierReference12-expected.txt
index c41ed2bceb102471cca4d21074d66d858b42c362..8491cf6b453e8bdef4cdb3852778ceb9b5f5177a 100644
--- a/ets2panda/test/compiler/ets/identifierReference12-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference12-expected.txt
@@ -400,35 +400,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -436,7 +408,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference13-expected.txt b/ets2panda/test/compiler/ets/identifierReference13-expected.txt
index b9a14ad2ffcf30aecc632e992570e00be7fabb65..e79b13c7adc76d7b4b979e934fbdd6ed538a5556 100644
--- a/ets2panda/test/compiler/ets/identifierReference13-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference13-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
@@ -472,35 +444,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -508,7 +452,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference14-expected.txt b/ets2panda/test/compiler/ets/identifierReference14-expected.txt
index eac46b8ad2fa66868ead09c64b2b5a75ee8739e6..f1ea709d8e8e655e1744636afed4c409bdfb0adf 100644
--- a/ets2panda/test/compiler/ets/identifierReference14-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference14-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
@@ -463,35 +435,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -499,7 +443,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -598,35 +542,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -634,7 +550,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
@@ -1065,35 +981,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -1101,7 +989,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference2-expected.txt b/ets2panda/test/compiler/ets/identifierReference2-expected.txt
index c0fb2875eaa35752d68d03bccc91b4ba8fc0d2a9..ea8c6190f38fa9a8514bf8100fd7c58acde14e83 100644
--- a/ets2panda/test/compiler/ets/identifierReference2-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference2-expected.txt
@@ -299,35 +299,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 31
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 27
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 33
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 16,
@@ -335,7 +307,7 @@
                   },
                   "end": {
                     "line": 16,
-                    "column": 33
+                    "column": 31
                   }
                 }
               },
@@ -346,7 +318,7 @@
                 },
                 "end": {
                   "line": 16,
-                  "column": 33
+                  "column": 31
                 }
               }
             },
diff --git a/ets2panda/test/compiler/ets/identifierReference3-expected.txt b/ets2panda/test/compiler/ets/identifierReference3-expected.txt
index f5c375d18a7e189f6b595e2753709d9831a6a57b..04579e18c56f736aeeb7802d01b42c6fe9663da4 100644
--- a/ets2panda/test/compiler/ets/identifierReference3-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference3-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference4-expected.txt b/ets2panda/test/compiler/ets/identifierReference4-expected.txt
index beb0f9de571c0db777b146fd15c7af262a494110..4268497fd7ac086a141e673b69d984658dfbaeb1 100644
--- a/ets2panda/test/compiler/ets/identifierReference4-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference4-expected.txt
@@ -322,35 +322,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -358,7 +330,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference5-expected.txt b/ets2panda/test/compiler/ets/identifierReference5-expected.txt
index ebaa3df0392c0733bb049e85472606fe1e15c774..ab93cc2a3c772cce758d471df3ccd073d488e45b 100644
--- a/ets2panda/test/compiler/ets/identifierReference5-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference5-expected.txt
@@ -154,35 +154,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 22
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 22,
-                      "column": 18
-                    },
-                    "end": {
-                      "line": 22,
-                      "column": 23
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 22,
@@ -190,7 +162,7 @@
                   },
                   "end": {
                     "line": 22,
-                    "column": 23
+                    "column": 22
                   }
                 }
               },
@@ -201,7 +173,7 @@
                 },
                 "end": {
                   "line": 22,
-                  "column": 23
+                  "column": 22
                 }
               }
             },
@@ -214,7 +186,7 @@
               },
               "end": {
                 "line": 22,
-                "column": 23
+                "column": 22
               }
             }
           },
@@ -441,35 +413,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -477,7 +421,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
@@ -661,35 +605,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -697,7 +613,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -1155,35 +1071,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -1191,7 +1079,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference8-expected.txt b/ets2panda/test/compiler/ets/identifierReference8-expected.txt
index 83755755a33dca855349b06b6c2c0e7a3f439b69..e024f1400553a8a09efc24c62fd022600855ca8b 100644
--- a/ets2panda/test/compiler/ets/identifierReference8-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference8-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/identifierReference9-expected.txt b/ets2panda/test/compiler/ets/identifierReference9-expected.txt
index 353fdd49ca7eaa0236b1c86a5bc47edf77ee72d0..9821c82b36cb5b0b6e3a9760ac9609acb48cc0b8 100644
--- a/ets2panda/test/compiler/ets/identifierReference9-expected.txt
+++ b/ets2panda/test/compiler/ets/identifierReference9-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 10
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 14
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 10
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt
index c45fd0e9db9938aefd0146034a3e3bfab558a141..43583c7c2ab739497252ec9cbc4eacebf1cc9539 100644
--- a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt
+++ b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt b/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt
index 5ffb88ab4ac898617b23bc5803309eecf276a29c..2fa070f0f3c31db6b1192968b68b0bf818a0396a 100644
--- a/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt
+++ b/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt
@@ -52,35 +52,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -88,7 +60,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 17
+                      "column": 16
                     }
                   }
                 },
@@ -100,7 +72,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 17
+                    "column": 16
                   }
                 }
               },
@@ -111,7 +83,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 17
+                  "column": 16
                 }
               }
             },
@@ -331,35 +303,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -367,7 +311,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt
index 5a6ea0bffa13395ca21affeb594b951c808099c4..881273d21b718fa0af7213248988b03641e4af28 100644
--- a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt
@@ -1117,35 +1117,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 35,
-                                        "column": 17
-                                      },
-                                      "end": {
-                                        "line": 35,
-                                        "column": 21
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 35,
-                                      "column": 17
-                                    },
-                                    "end": {
-                                      "line": 35,
-                                      "column": 23
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 35,
@@ -1153,7 +1125,7 @@
                                   },
                                   "end": {
                                     "line": 35,
-                                    "column": 23
+                                    "column": 21
                                   }
                                 }
                               },
@@ -1164,7 +1136,7 @@
                                 },
                                 "end": {
                                   "line": 35,
-                                  "column": 23
+                                  "column": 21
                                 }
                               }
                             },
@@ -1190,35 +1162,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 35,
-                                        "column": 29
-                                      },
-                                      "end": {
-                                        "line": 35,
-                                        "column": 33
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 35,
-                                      "column": 29
-                                    },
-                                    "end": {
-                                      "line": 35,
-                                      "column": 36
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 35,
@@ -1226,7 +1170,7 @@
                                   },
                                   "end": {
                                     "line": 35,
-                                    "column": 36
+                                    "column": 33
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt
index 33cb453b9b69a2b1560988acc467f849141d69cb..ec301c1952cfcf3bd162c3b4a8188fedbc90ba30 100644
--- a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt
@@ -1016,35 +1016,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -1052,7 +1024,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt
index e6a9aa7fd9c36793eaaefd3f0f061ae9db09c3be..d248ed025a62bc84f4caa5d2ba05034546bf7321 100644
--- a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt
@@ -939,35 +939,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -975,7 +947,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt b/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt
index 035dd5dd21c1153e965fd16b527ba91e0703095a..6612b6701bc40e2aa0041815df4b35bccd2fd873 100644
--- a/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt
@@ -350,35 +350,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -386,7 +358,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt
index bb1005989a0af56b8f0cdd76857e7d4a8184ac95..f3a397503a66d06957e9188b6791df6e1f3d506a 100644
--- a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt
@@ -132,35 +132,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 32
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 17,
-                      "column": 28
-                    },
-                    "end": {
-                      "line": 17,
-                      "column": 33
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 17,
@@ -168,7 +140,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 33
+                    "column": 32
                   }
                 }
               },
@@ -179,7 +151,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 33
+                  "column": 32
                 }
               }
             },
@@ -192,7 +164,7 @@
               },
               "end": {
                 "line": 17,
-                "column": 33
+                "column": 32
               }
             }
           },
diff --git a/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt b/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt
index 13e1ac543f428998ece0991270af1ddc2c0a2fbf..b0ef26a98ce9627dfc36f2011358b87dbb9b9def 100644
--- a/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt
@@ -839,35 +839,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -875,7 +847,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt b/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt
index e91b4302b347de3d236b185a98fda9500ef65606..9e9c1c964e2e2dec4931127879ac42328fb812e9 100644
--- a/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt
@@ -762,35 +762,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -798,7 +770,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt b/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt
index c5e6ef865081611f4c82aea5370f6909386a329c..aadbca07d2a6be72da84eeacd6bf7335c0da3c1b 100644
--- a/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt
@@ -764,35 +764,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -800,7 +772,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt
index e5000ca2bf9ef9600c2b6732f74e534d35a80dfd..c94d58895aa7fd1ee7ea108b01b6463cff7328ab 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -408,35 +352,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -444,7 +360,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt
index ea3316db26c4d23b54dcbae5c1ce8ff25d23f1fc..17f54da2233f5ea992b88faf39231b37599a1a02 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -408,35 +352,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -444,7 +360,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt
index 71aed74035aac38caa6046a084e582c29f3671ad..bba617a0503d4118a56b32146007eee12bedc62d 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -408,35 +352,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -444,7 +360,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt
index 6a39955b55ce78f36ffbe89e5c2b83142b2d01f1..bf951e79da6c5c2cb82c335c0742fe7ab1a6e19e 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -475,35 +419,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -511,7 +427,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt
index b552140602629eca95058da5603c4fb6d9c1222e..c5809fe4281aa1e864bbd861bfc325e3c1463340 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -515,35 +459,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -551,7 +467,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt
index a038226fee0651e5166d28ea20bc53b3e4d84abb..5a0f9e58378f74953136f3b76069bd30a5140aa0 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -515,35 +459,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -551,7 +467,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt
index 76d81db4cf749e18eba53af913aa17aadd024d3c..69a7dcee3d47cf04ee46d27dc831484dc13d4219 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -515,35 +459,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -551,7 +467,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt
index de53553744380095c3edf32e5f0f34767fd8eac5..aad6f38d22e9ee0937e7f68150507cb8699edc5c 100644
--- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -515,35 +459,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -551,7 +467,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt b/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt
index f902846d03329cbaf2f6f287b0d0a254703358b1..327677bd8f58a64cafef8edfb2535c397accd411 100644
--- a/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt
@@ -425,35 +425,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -461,7 +433,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt b/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt
index 37596af9b0411671162bed3285e0892dfc1935ef..cc9be67f4a86deee1bd36d7d839c970ae2c20c5d 100644
--- a/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt
@@ -448,35 +448,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -484,7 +456,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt b/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt
index 7a5181e8f833dcd0efe9e484c626a4c8b470c3a3..37bbc972ccceab3fe4f94e6b9224c3527b18e388 100644
--- a/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt
@@ -310,35 +310,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -346,7 +318,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -475,35 +447,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 27,
-                              "column": 25
-                            },
-                            "end": {
-                              "line": 27,
-                              "column": 29
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 27,
-                            "column": 25
-                          },
-                          "end": {
-                            "line": 27,
-                            "column": 31
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 27,
@@ -511,7 +455,7 @@
                         },
                         "end": {
                           "line": 27,
-                          "column": 31
+                          "column": 29
                         }
                       }
                     },
@@ -761,35 +705,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -797,7 +713,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt b/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt
index 013fcfafc4406c822305c7b524edcaa704178a9e..a31539a925098d6bcabdaf3cc527817915740372 100644
--- a/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt
@@ -425,35 +425,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -461,7 +433,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt b/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt
index e7356eb49ac88663605c00760fdfa126b2da8113..6b70de3ff26a341fdf93f83b134062ee8c8bdbb6 100644
--- a/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt
@@ -448,35 +448,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -484,7 +456,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt b/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt
index fa41a9e7db8e6ea6dfb79ef3d996be4a197c9388..d231f2fd3f7c28868c615eb84dc56941cdad86df 100644
--- a/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt
+++ b/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt
@@ -310,35 +310,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -346,7 +318,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
@@ -475,35 +447,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 27,
-                              "column": 26
-                            },
-                            "end": {
-                              "line": 27,
-                              "column": 30
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 27,
-                            "column": 26
-                          },
-                          "end": {
-                            "line": 27,
-                            "column": 32
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 27,
@@ -511,7 +455,7 @@
                         },
                         "end": {
                           "line": 27,
-                          "column": 32
+                          "column": 30
                         }
                       }
                     },
@@ -761,35 +705,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -797,7 +713,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt
index a17df28bb337b0d74b04879a1bb4e4a8890a0fd9..e5daef378c376541024b30d1d13937795d228f0d 100644
--- a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt
index c35a6a6a7b7dee5698dd3f674b20ff7fafdcbc30..53e4a799ded9fb5344dcaedce5563e339b4c63b5 100644
--- a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt
@@ -325,35 +325,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -361,7 +333,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt
index 132a58cca84c259f538604a00d25b0fbf40fcfb9..56a885c6f14a03ffa35eebf25b5deb09b5b9835d 100644
--- a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt
@@ -1559,35 +1559,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 39,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 39,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 39,
@@ -1595,7 +1567,7 @@
                     },
                     "end": {
                       "line": 39,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt
index 22b2a3c2f299f5bea005e116a3f713eede8dbe30..8251e3c4ae92a1820c8cc934833c763d50280591 100644
--- a/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -345,35 +317,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 32
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 36
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 32
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 38
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 18,
@@ -381,7 +325,7 @@
                                   },
                                   "end": {
                                     "line": 18,
-                                    "column": 38
+                                    "column": 36
                                   }
                                 }
                               },
@@ -392,7 +336,7 @@
                                 },
                                 "end": {
                                   "line": 18,
-                                  "column": 38
+                                  "column": 36
                                 }
                               }
                             },
@@ -460,35 +404,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 49
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 53
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 49
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 56
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 18,
@@ -496,7 +412,7 @@
                                   },
                                   "end": {
                                     "line": 18,
-                                    "column": 56
+                                    "column": 53
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt
index 581964183a2641672a9bbc8fde3b4fe0532fe59b..5b92c309d011df517d1fd7a9d9448bd9e1f2e410 100644
--- a/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt
@@ -140,35 +140,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -176,7 +148,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 32
+                      "column": 29
                     }
                   }
                 },
@@ -298,35 +270,7 @@
               "type": "ETSFunctionType",
               "params": [],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 14
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 18
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 19,
-                      "column": 14
-                    },
-                    "end": {
-                      "line": 19,
-                      "column": 20
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 19,
@@ -334,7 +278,7 @@
                   },
                   "end": {
                     "line": 19,
-                    "column": 20
+                    "column": 18
                   }
                 }
               },
@@ -345,7 +289,7 @@
                 },
                 "end": {
                   "line": 19,
-                  "column": 20
+                  "column": 18
                 }
               }
             },
diff --git a/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt
index 5737ced2b4eaa0c3cb5614fd7a5e7a02b82a8e43..e26552735aa5d641d139fd096bb2da0a79de0f24 100644
--- a/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt
+++ b/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt
@@ -1232,35 +1232,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -1268,7 +1240,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt
index 1fa2395cb8c0a1432a31b81fdcd6115be6fe23d1..1bf9ff1ba3994d767b177ad08431a75c8921fa67 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt
@@ -265,35 +265,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 26
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 30
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 26
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 32
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 18,
@@ -301,7 +273,7 @@
                                   },
                                   "end": {
                                     "line": 18,
-                                    "column": 32
+                                    "column": 30
                                   }
                                 }
                               },
@@ -312,7 +284,7 @@
                                 },
                                 "end": {
                                   "line": 18,
-                                  "column": 32
+                                  "column": 30
                                 }
                               }
                             },
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt
index 9aef2f59fa456abcb376b8db9e612d4823ab7fd5..20a12a04a571c39a783bc585957059fb446a0ae3 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt
@@ -327,35 +327,7 @@
                                 "type": "ETSFunctionType",
                                 "params": [],
                                 "returnType": {
-                                  "type": "ETSTypeReference",
-                                  "part": {
-                                    "type": "ETSTypeReferencePart",
-                                    "name": {
-                                      "type": "Identifier",
-                                      "name": "void",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 18,
-                                          "column": 32
-                                        },
-                                        "end": {
-                                          "line": 18,
-                                          "column": 36
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 32
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 38
-                                      }
-                                    }
-                                  },
+                                  "type": "ETSPrimitiveType",
                                   "loc": {
                                     "start": {
                                       "line": 18,
@@ -363,7 +335,7 @@
                                     },
                                     "end": {
                                       "line": 18,
-                                      "column": 38
+                                      "column": 36
                                     }
                                   }
                                 },
@@ -374,7 +346,7 @@
                                   },
                                   "end": {
                                     "line": 18,
-                                    "column": 38
+                                    "column": 36
                                   }
                                 }
                               },
@@ -385,7 +357,7 @@
                                 },
                                 "end": {
                                   "line": 18,
-                                  "column": 38
+                                  "column": 36
                                 }
                               }
                             },
diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt
index 2237eae3ae1026548f75c9359fbb11ddc2c4cabc..b8abac3389f9707693007cc37d74a5a7e12f62b2 100644
--- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt
@@ -461,35 +461,7 @@
                 "type": "ETSFunctionType",
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -497,7 +469,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
@@ -508,7 +480,7 @@
                   },
                   "end": {
                     "line": 23,
-                    "column": 34
+                    "column": 32
                   }
                 }
               },
@@ -519,7 +491,7 @@
                 },
                 "end": {
                   "line": 23,
-                  "column": 34
+                  "column": 32
                 }
               }
             },
diff --git a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt
index 8588d0e5bb7856ac9be9aa88eb29fa0bf57e7152..1d193fa51dda23868fbb148f84620154379f4a85 100644
--- a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt
+++ b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 26
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 30
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 26
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 31
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 31
+                              "column": 30
                             }
                           }
                         },
@@ -123,7 +95,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 31
+                            "column": 30
                           }
                         }
                       },
@@ -135,7 +107,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 31
+                          "column": 30
                         }
                       }
                     },
@@ -146,41 +118,13 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 31
+                        "column": 30
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -188,7 +132,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -207,35 +151,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 25
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 29
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 25
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 31
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 18,
@@ -243,7 +159,7 @@
                                   },
                                   "end": {
                                     "line": 18,
-                                    "column": 31
+                                    "column": 29
                                   }
                                 }
                               },
@@ -254,7 +170,7 @@
                                 },
                                 "end": {
                                   "line": 18,
-                                  "column": 31
+                                  "column": 29
                                 }
                               }
                             },
@@ -280,35 +196,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 18,
-                                        "column": 36
-                                      },
-                                      "end": {
-                                        "line": 18,
-                                        "column": 40
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 36
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 43
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 18,
@@ -316,7 +204,7 @@
                                   },
                                   "end": {
                                     "line": 18,
-                                    "column": 43
+                                    "column": 40
                                   }
                                 }
                               },
@@ -989,35 +877,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 30
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 34
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 36
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -1025,7 +885,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 36
+                      "column": 34
                     }
                   }
                 },
@@ -1044,35 +904,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 24,
-                                        "column": 20
-                                      },
-                                      "end": {
-                                        "line": 24,
-                                        "column": 24
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 24,
-                                      "column": 20
-                                    },
-                                    "end": {
-                                      "line": 24,
-                                      "column": 26
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 24,
@@ -1080,7 +912,7 @@
                                   },
                                   "end": {
                                     "line": 24,
-                                    "column": 26
+                                    "column": 24
                                   }
                                 }
                               },
@@ -1091,7 +923,7 @@
                                 },
                                 "end": {
                                   "line": 24,
-                                  "column": 26
+                                  "column": 24
                                 }
                               }
                             },
@@ -1117,35 +949,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 24,
-                                        "column": 31
-                                      },
-                                      "end": {
-                                        "line": 24,
-                                        "column": 35
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 24,
-                                      "column": 31
-                                    },
-                                    "end": {
-                                      "line": 24,
-                                      "column": 38
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 24,
@@ -1153,7 +957,7 @@
                                   },
                                   "end": {
                                     "line": 24,
-                                    "column": 38
+                                    "column": 35
                                   }
                                 }
                               },
@@ -1641,35 +1445,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -1677,7 +1453,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -1696,35 +1472,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 31,
-                                        "column": 20
-                                      },
-                                      "end": {
-                                        "line": 31,
-                                        "column": 24
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 31,
-                                      "column": 20
-                                    },
-                                    "end": {
-                                      "line": 31,
-                                      "column": 26
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 31,
@@ -1732,7 +1480,7 @@
                                   },
                                   "end": {
                                     "line": 31,
-                                    "column": 26
+                                    "column": 24
                                   }
                                 }
                               },
@@ -1743,7 +1491,7 @@
                                 },
                                 "end": {
                                   "line": 31,
-                                  "column": 26
+                                  "column": 24
                                 }
                               }
                             },
@@ -1769,35 +1517,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 31,
-                                        "column": 31
-                                      },
-                                      "end": {
-                                        "line": 31,
-                                        "column": 35
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 31,
-                                      "column": 31
-                                    },
-                                    "end": {
-                                      "line": 31,
-                                      "column": 38
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 31,
@@ -1805,7 +1525,7 @@
                                   },
                                   "end": {
                                     "line": 31,
-                                    "column": 38
+                                    "column": 35
                                   }
                                 }
                               },
@@ -2268,35 +1988,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 39,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 39,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 39,
@@ -2304,7 +1996,7 @@
                     },
                     "end": {
                       "line": 39,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -2506,35 +2198,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 41,
-                                        "column": 27
-                                      },
-                                      "end": {
-                                        "line": 41,
-                                        "column": 31
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 41,
-                                      "column": 27
-                                    },
-                                    "end": {
-                                      "line": 41,
-                                      "column": 33
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 41,
@@ -2542,7 +2206,7 @@
                                   },
                                   "end": {
                                     "line": 41,
-                                    "column": 33
+                                    "column": 31
                                   }
                                 }
                               },
@@ -2553,7 +2217,7 @@
                                 },
                                 "end": {
                                   "line": 41,
-                                  "column": 33
+                                  "column": 31
                                 }
                               }
                             },
@@ -2621,35 +2285,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 41,
-                                        "column": 46
-                                      },
-                                      "end": {
-                                        "line": 41,
-                                        "column": 50
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 41,
-                                      "column": 46
-                                    },
-                                    "end": {
-                                      "line": 41,
-                                      "column": 53
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 41,
@@ -2657,7 +2293,7 @@
                                   },
                                   "end": {
                                     "line": 41,
-                                    "column": 53
+                                    "column": 50
                                   }
                                 }
                               },
@@ -3381,35 +3017,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 52,
-                                        "column": 27
-                                      },
-                                      "end": {
-                                        "line": 52,
-                                        "column": 31
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 52,
-                                      "column": 27
-                                    },
-                                    "end": {
-                                      "line": 52,
-                                      "column": 33
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 52,
@@ -3417,7 +3025,7 @@
                                   },
                                   "end": {
                                     "line": 52,
-                                    "column": 33
+                                    "column": 31
                                   }
                                 }
                               },
@@ -3428,7 +3036,7 @@
                                 },
                                 "end": {
                                   "line": 52,
-                                  "column": 33
+                                  "column": 31
                                 }
                               }
                             },
@@ -3496,35 +3104,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 52,
-                                        "column": 46
-                                      },
-                                      "end": {
-                                        "line": 52,
-                                        "column": 50
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 52,
-                                      "column": 46
-                                    },
-                                    "end": {
-                                      "line": 52,
-                                      "column": 53
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 52,
@@ -3532,7 +3112,7 @@
                                   },
                                   "end": {
                                     "line": 52,
-                                    "column": 53
+                                    "column": 50
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/launch_expression-expected.txt b/ets2panda/test/compiler/ets/launch_expression-expected.txt
index e0578ae16196361e968129658537280fb2e39d55..80498b483417438f723487d40f31f32025ecac3b 100644
--- a/ets2panda/test/compiler/ets/launch_expression-expected.txt
+++ b/ets2panda/test/compiler/ets/launch_expression-expected.txt
@@ -873,35 +873,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 47
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 51
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 47
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 53
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -909,7 +881,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 53
+                      "column": 51
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt
index 520b7c45cc2609b062daec9d91f721d5e9c14959..379d7e6cedd72106b31c2dfe0789486c7f6e17aa 100644
--- a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt
+++ b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt
@@ -64,43 +64,15 @@
           }
         ],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 24
-                },
-                "end": {
-                  "line": 16,
-                  "column": 28
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 24
-              },
-              "end": {
-                "line": 17,
-                "column": 5
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
               "column": 24
             },
             "end": {
-              "line": 17,
-              "column": 5
+              "line": 16,
+              "column": 28
             }
           }
         },
@@ -110,8 +82,8 @@
             "column": 12
           },
           "end": {
-            "line": 17,
-            "column": 5
+            "line": 16,
+            "column": 28
           }
         }
       },
diff --git a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt
index 9c8d5790d23a90e3ee6a20cb67a84306d46f7edd..4ce29d80363e688d07db106b03144c0370d3909c 100644
--- a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt
+++ b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt
@@ -31096,35 +31096,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 277,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 277,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 277,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 277,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 277,
@@ -31132,7 +31104,7 @@
                     },
                     "end": {
                       "line": 277,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt
index 5ffa599cc2efe88640db99e190402b31e0c9d79a..63f199135e987edeebc3aa0b6a7e0f0b996df16c 100644
--- a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt
+++ b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt
@@ -22,43 +22,15 @@
         "type": "ETSFunctionType",
         "params": [],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 28
-                },
-                "end": {
-                  "line": 16,
-                  "column": 32
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 28
-              },
-              "end": {
-                "line": 18,
-                "column": 9
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
               "column": 28
             },
             "end": {
-              "line": 18,
-              "column": 9
+              "line": 16,
+              "column": 32
             }
           }
         },
@@ -68,8 +40,8 @@
             "column": 22
           },
           "end": {
-            "line": 18,
-            "column": 9
+            "line": 16,
+            "column": 32
           }
         }
       },
@@ -245,35 +217,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 39
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 43
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 39
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 45
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -281,7 +225,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 45
+                      "column": 43
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt
index 235443a3f3969490bd92014eb6ae05f0c9aaa759..ecf979a735ede2fa2b4472831eca1e23c2223374 100644
--- a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt
+++ b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -408,35 +352,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -444,7 +360,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -827,35 +743,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -863,7 +751,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -962,35 +850,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -998,7 +858,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -1167,35 +1027,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -1203,7 +1035,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -1871,35 +1703,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 41,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 41,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 41,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 41,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 41,
@@ -1907,7 +1711,7 @@
                     },
                     "end": {
                       "line": 41,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -2006,35 +1810,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 42,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 42,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 42,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 42,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 42,
@@ -2042,7 +1818,7 @@
                     },
                     "end": {
                       "line": 42,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
@@ -2211,35 +1987,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 44,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 44,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 44,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 44,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 44,
@@ -2247,7 +1995,7 @@
                     },
                     "end": {
                       "line": 44,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt
index 186fa4c37141f593fb820c8dc978c6d5a0388b67..e720473d1169fb54ec82bbfe77a467a42b8a65af 100644
--- a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt
+++ b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt
@@ -310,35 +310,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -346,7 +318,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 17
+                      "column": 16
                     }
                   }
                 },
@@ -358,7 +330,7 @@
                   },
                   "end": {
                     "line": 21,
-                    "column": 17
+                    "column": 16
                   }
                 }
               },
@@ -369,7 +341,7 @@
                 },
                 "end": {
                   "line": 21,
-                  "column": 17
+                  "column": 16
                 }
               }
             },
@@ -749,35 +721,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -785,7 +729,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt
index 87cc2b20e2a8cdf7176e20cbbdabecb1e04870fb..368e2ab824fc10bcddca0c038d80aa5d476d3396 100644
--- a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt
+++ b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt
@@ -52,35 +52,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -88,7 +60,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 17
+                      "column": 16
                     }
                   }
                 },
@@ -100,7 +72,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 17
+                    "column": 16
                   }
                 }
               },
@@ -111,7 +83,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 17
+                  "column": 16
                 }
               }
             },
@@ -289,35 +261,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -325,7 +269,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 26
+                      "column": 25
                     }
                   }
                 },
@@ -424,35 +368,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -460,7 +376,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 26
+                      "column": 25
                     }
                   }
                 },
@@ -575,35 +491,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 25,
-                              "column": 27
-                            },
-                            "end": {
-                              "line": 25,
-                              "column": 31
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 25,
-                            "column": 27
-                          },
-                          "end": {
-                            "line": 25,
-                            "column": 32
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 25,
@@ -611,7 +499,7 @@
                         },
                         "end": {
                           "line": 25,
-                          "column": 32
+                          "column": 31
                         }
                       }
                     },
@@ -738,35 +626,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 26,
-                              "column": 21
-                            },
-                            "end": {
-                              "line": 26,
-                              "column": 25
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 26,
-                            "column": 21
-                          },
-                          "end": {
-                            "line": 26,
-                            "column": 26
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 26,
@@ -774,7 +634,7 @@
                         },
                         "end": {
                           "line": 26,
-                          "column": 26
+                          "column": 25
                         }
                       }
                     },
@@ -1063,35 +923,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -1099,7 +931,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
@@ -1228,35 +1060,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 35,
-                              "column": 27
-                            },
-                            "end": {
-                              "line": 35,
-                              "column": 31
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 35,
-                            "column": 27
-                          },
-                          "end": {
-                            "line": 35,
-                            "column": 33
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 35,
@@ -1264,7 +1068,7 @@
                         },
                         "end": {
                           "line": 35,
-                          "column": 33
+                          "column": 31
                         }
                       }
                     },
diff --git a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt
index ee9fd7f3da67951f1f8795e15728c725fe76a1e3..1ebdcf5cf1d1d33877fbdc3bb4a820badcbd9acb 100644
--- a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt
+++ b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt b/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt
index 092cdcfa48833b894b3d303bc1df9e373084fa2b..f7536c676dec6fc9b96ed3978ddac483c3b64739 100644
--- a/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt
+++ b/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt
@@ -438,35 +438,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -474,7 +446,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -700,35 +672,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 33
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 37
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 33
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 39
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 19,
@@ -736,7 +680,7 @@
                         },
                         "end": {
                           "line": 19,
-                          "column": 39
+                          "column": 37
                         }
                       }
                     },
@@ -848,35 +792,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -884,7 +800,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt b/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt
index a20cd28451c678cd7ad478608963f757ed378f4c..f03bd4f954b2b535108e4868b98354a3b0de52ef 100644
--- a/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt
+++ b/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt
@@ -344,35 +344,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 35
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 39
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 35
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 41
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -380,7 +352,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 41
+                      "column": 39
                     }
                   }
                 },
@@ -795,35 +767,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 35
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 39
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 35
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 41
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -831,7 +775,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 41
+                      "column": 39
                     }
                   }
                 },
@@ -1161,35 +1105,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -1197,7 +1113,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt
index f4a594d5c50b22287e9e5a333451f0ff39b8bb73..bd23a6c98aa2d93c0cc2fc13865b3bbefc082540 100644
--- a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt
+++ b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 33
+                      "column": 32
                     }
                   }
                 },
@@ -869,35 +813,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 34,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 34,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 34,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 34,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 34,
@@ -905,7 +821,7 @@
                     },
                     "end": {
                       "line": 34,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt b/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt
index 218cfffdcb33c7c392be1d8fa7840ee67f888e43..3e309edc7de5a371ff768bb2bd3e21ad881fab95 100644
--- a/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt
+++ b/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt
@@ -479,35 +479,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -515,7 +487,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt b/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt
index 91ecb22a02e5f3202b3c163e29017ab67a581a59..5cad4b3869cf7d5d29432b00fc8f14527516e81f 100644
--- a/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt
+++ b/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt
@@ -301,35 +301,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -337,7 +309,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
@@ -478,35 +450,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -514,7 +458,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt b/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt
index 694d785f8faa4f56d0e13b8de7a5c12ec7fa809b..2f8abc4deea457f710c0c4ddde9fc69bb273d431 100644
--- a/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt
+++ b/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt b/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt
index 4064670059063b05ec5bbc0b25d0a0a50b6eff98..c2eb96050faca497c9918c20f4c47f15faa0323b 100644
--- a/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt
+++ b/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt
@@ -366,35 +366,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -402,7 +374,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt
index 4a7b6839493dbc97ec772b1c516c8d5e7d83ad1a..c3af20f28eea9c2fbe2ee8fd63df834ca5669032 100644
--- a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt
+++ b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt
index 0bf5ccb540c0991b880db5fa0874e830b2c6eb63..47319178150d0cc6a8589cddff89ba458bf2cb1e 100644
--- a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt
+++ b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt
index c7344bfab70acc69f02189e13a433c2d2018d1b7..19c41c77fe7670f0ffc1376b3f8d8d1c43bb58ce 100644
--- a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt
+++ b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt
index 805ca37c91ebced7d8c924b502aa5367f70e003d..545a47975d11d612bf15c315ce4e51dba1c5b837 100644
--- a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt
+++ b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt
@@ -234,35 +234,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 17,
-                                        "column": 18
-                                      },
-                                      "end": {
-                                        "line": 17,
-                                        "column": 22
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 17,
-                                      "column": 18
-                                    },
-                                    "end": {
-                                      "line": 17,
-                                      "column": 24
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 17,
@@ -270,7 +242,7 @@
                                   },
                                   "end": {
                                     "line": 17,
-                                    "column": 24
+                                    "column": 22
                                   }
                                 }
                               },
@@ -281,7 +253,7 @@
                                 },
                                 "end": {
                                   "line": 17,
-                                  "column": 24
+                                  "column": 22
                                 }
                               }
                             },
diff --git a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt
index f309c04503198af162a59c46ddc98158510b52aa..9b711484195f7847dc81781176e2d60b30768300 100644
--- a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt
+++ b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt
@@ -927,35 +927,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 39
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 43
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 39
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 45
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -963,7 +935,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 45
+                      "column": 43
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/nullableTuple-expected.txt b/ets2panda/test/compiler/ets/nullableTuple-expected.txt
index 6cd2174f4a8d7e6d0de225745c01486ca618e50c..ae6508298aa23dae204524279a8deac1860330a0 100644
--- a/ets2panda/test/compiler/ets/nullableTuple-expected.txt
+++ b/ets2panda/test/compiler/ets/nullableTuple-expected.txt
@@ -357,35 +357,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -393,7 +365,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt b/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt
index 9924e957d690a3113855b4d71560149411b50da3..94711f44e179b57c19bfc8b8ba860c5576481106 100644
--- a/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt
+++ b/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 27
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 31
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 27
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 32
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 32
+                              "column": 31
                             }
                           }
                         },
@@ -217,7 +189,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 32
+                            "column": 31
                           }
                         }
                       },
@@ -229,7 +201,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 32
+                          "column": 31
                         }
                       }
                     },
@@ -254,41 +226,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 32
+                        "column": 31
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 34
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 38
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 34
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -296,7 +240,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 40
+                      "column": 38
                     }
                   }
                 },
@@ -435,35 +379,7 @@
                             "type": "ETSFunctionType",
                             "params": [],
                             "returnType": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "void",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 1,
-                                      "column": 3
-                                    },
-                                    "end": {
-                                      "line": 1,
-                                      "column": 3
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 1,
-                                    "column": 3
-                                  },
-                                  "end": {
-                                    "line": 1,
-                                    "column": 3
-                                  }
-                                }
-                              },
+                              "type": "ETSPrimitiveType",
                               "loc": {
                                 "start": {
                                   "line": 1,
@@ -552,35 +468,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 1,
-                              "column": 3
-                            },
-                            "end": {
-                              "line": 1,
-                              "column": 3
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 1,
-                            "column": 3
-                          },
-                          "end": {
-                            "line": 1,
-                            "column": 3
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 1,
diff --git a/ets2panda/test/compiler/ets/override-expected.txt b/ets2panda/test/compiler/ets/override-expected.txt
index ea0b9f42c74dc4f64f321ae4202ee0f86ed621bb..5d9f9166d902d288f512e47845a5fd76bf7373a4 100644
--- a/ets2panda/test/compiler/ets/override-expected.txt
+++ b/ets2panda/test/compiler/ets/override-expected.txt
@@ -1648,35 +1648,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -1684,7 +1656,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/override11-expected.txt b/ets2panda/test/compiler/ets/override11-expected.txt
index fce7b048ca830d8898a1dcb80786a1a8b5f09812..c8a4a3ecedaa595d01c0b1827fdbb8913e7a0e36 100644
--- a/ets2panda/test/compiler/ets/override11-expected.txt
+++ b/ets2panda/test/compiler/ets/override11-expected.txt
@@ -564,35 +564,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -600,7 +572,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/override18-expected.txt b/ets2panda/test/compiler/ets/override18-expected.txt
index a3d01a0fb6531e631db5cadfe0e58d4eefa8f134..7a632e825f9211f616fb497933427987568a3bdf 100644
--- a/ets2panda/test/compiler/ets/override18-expected.txt
+++ b/ets2panda/test/compiler/ets/override18-expected.txt
@@ -698,35 +698,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -734,7 +706,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/override19-expected.txt b/ets2panda/test/compiler/ets/override19-expected.txt
index c84d6058093bd1380b95849f3d614c84b4a86138..8de54e6fc9a16b81f9048233d599d17f2667bced 100644
--- a/ets2panda/test/compiler/ets/override19-expected.txt
+++ b/ets2panda/test/compiler/ets/override19-expected.txt
@@ -774,35 +774,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -810,7 +782,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/override7-expected.txt b/ets2panda/test/compiler/ets/override7-expected.txt
index 07454f6cbc3d879d2d5c311aff721388d2821331..23688d8c446250c6c09c0ff071397b58d811bae6 100644
--- a/ets2panda/test/compiler/ets/override7-expected.txt
+++ b/ets2panda/test/compiler/ets/override7-expected.txt
@@ -52,35 +52,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 9
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 13
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 9
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 14
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -88,7 +60,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 14
+                      "column": 13
                     }
                   }
                 },
@@ -100,7 +72,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 14
+                    "column": 13
                   }
                 }
               },
@@ -111,7 +83,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 14
+                  "column": 13
                 }
               }
             },
diff --git a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt
index 66ec32d13735169de62634804767afe41114a573..46aee6f7dc95f75b1fab25afabe2b550242fae0f 100644
--- a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt
+++ b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt b/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt
index 1deee57fdcaeb8c9b22e05c26e6b2414995a61ed..a8ef1eed4de9f63bca479d11c778293f7f3bd4aa 100644
--- a/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt
+++ b/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt b/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt
index 43de9aa5285eea7c7dcc2b286473e4c33ea681bb..a0a3db302e3231523ff3263ba9c12c97ed907aef 100644
--- a/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt
+++ b/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt
@@ -436,35 +436,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -472,7 +444,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt b/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt
index b3de43ef5abc506550213390af2dee122a320479..14209131644c913af868ea762c83e0f1c47b8fb1 100644
--- a/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt
+++ b/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt
index 97d9b27bee3c0c609ec085e8808444bda657149a..86a5b570f94302d36ad1d0db86e145b8e73fde36 100644
--- a/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt
@@ -349,35 +349,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 20,
@@ -385,7 +357,7 @@
                             },
                             "end": {
                               "line": 20,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -397,7 +369,7 @@
                           },
                           "end": {
                             "line": 20,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -409,7 +381,7 @@
                         },
                         "end": {
                           "line": 20,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -420,7 +392,7 @@
                       },
                       "end": {
                         "line": 20,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
diff --git a/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt
index 9911d705dc73d93d2fe45d262263252f10c33c58..a49a77a89ae5ae4a86503ad1dfcf39446d19b5cf 100644
--- a/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt
@@ -349,35 +349,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 20,
@@ -385,7 +357,7 @@
                             },
                             "end": {
                               "line": 20,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -397,7 +369,7 @@
                           },
                           "end": {
                             "line": 20,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -409,7 +381,7 @@
                         },
                         "end": {
                           "line": 20,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -420,7 +392,7 @@
                       },
                       "end": {
                         "line": 20,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
diff --git a/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt
index aaaecc258424671d7e85903569aeb6ac48d447e0..290cdd30e0d7735a99d36145a57b8f364afbc9e1 100644
--- a/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt
@@ -486,35 +486,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 22,
@@ -522,7 +494,7 @@
                             },
                             "end": {
                               "line": 22,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -534,7 +506,7 @@
                           },
                           "end": {
                             "line": 22,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -546,7 +518,7 @@
                         },
                         "end": {
                           "line": 22,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -557,7 +529,7 @@
                       },
                       "end": {
                         "line": 22,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
diff --git a/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt
index afc253df988913027b456bc86bcba2bfa36e4f38..5a6ce7d33daa95e653712d2b840d3eac9ec6ca96 100644
--- a/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -241,7 +213,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
@@ -573,35 +545,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 24,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 24,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 24,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 24,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 24,
@@ -609,7 +553,7 @@
                             },
                             "end": {
                               "line": 24,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -621,7 +565,7 @@
                           },
                           "end": {
                             "line": 24,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -633,7 +577,7 @@
                         },
                         "end": {
                           "line": 24,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -644,7 +588,7 @@
                       },
                       "end": {
                         "line": 24,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
diff --git a/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt
index 49ce2879b6b2259e4a159157911710146a4d9f75..8e2efb7703d9450caa722ee2caf0c64497615409 100644
--- a/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -241,7 +213,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
@@ -752,35 +724,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 28,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 28,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 28,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 28,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 28,
@@ -788,7 +732,7 @@
                             },
                             "end": {
                               "line": 28,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -800,7 +744,7 @@
                           },
                           "end": {
                             "line": 28,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -812,7 +756,7 @@
                         },
                         "end": {
                           "line": 28,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -823,7 +767,7 @@
                       },
                       "end": {
                         "line": 28,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
diff --git a/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt
index 5182f5da7a7c9f97514f3ec2345c047f6386c167..ce862a7ffb275071c0749b6ea920d4b154e51bb9 100644
--- a/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 24
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 28
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 24
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 35
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 35
+                              "column": 28
                             }
                           }
                         }
@@ -124,7 +96,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 35
+                            "column": 28
                           }
                         }
                       },
@@ -136,7 +108,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 35
+                          "column": 28
                         }
                       }
                     },
@@ -147,7 +119,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 35
+                        "column": 28
                       }
                     }
                   }
@@ -386,35 +358,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -422,7 +366,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -522,35 +466,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -558,7 +474,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt
index 3fc32efe476c42f374841e6358b856dde65c4789..47a35c73a54430274f5834f38e9ff5fd44d567f4 100644
--- a/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 24
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 28
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 24
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 35
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 35
+                              "column": 28
                             }
                           }
                         }
@@ -124,7 +96,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 35
+                            "column": 28
                           }
                         }
                       },
@@ -136,7 +108,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 35
+                          "column": 28
                         }
                       }
                     },
@@ -147,7 +119,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 35
+                        "column": 28
                       }
                     }
                   }
@@ -386,35 +358,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -422,7 +366,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -522,35 +466,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -558,7 +474,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt
index ba9a7eb04d4d4eab1d0e8403e670a783c293ee82..a634a58ce822400bd0c02c4acbb30cda0a12d501 100644
--- a/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 24
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 28
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 24
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 35
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 35
+                              "column": 28
                             }
                           }
                         }
@@ -124,7 +96,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 35
+                            "column": 28
                           }
                         }
                       },
@@ -136,7 +108,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 35
+                          "column": 28
                         }
                       }
                     },
@@ -147,7 +119,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 35
+                        "column": 28
                       }
                     }
                   }
@@ -386,35 +358,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -422,7 +366,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -522,35 +466,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -558,7 +474,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt
index 0b5a41b6b2d6841716096f929a8d152c172a7065..d262f89bdd788cdfa6a365df005ecd9d961798ef 100644
--- a/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 32
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 36
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 32
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 43
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 43
+                              "column": 36
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 43
+                            "column": 36
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 43
+                          "column": 36
                         }
                       }
                     },
@@ -241,41 +213,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 43
+                        "column": 36
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 50
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 46
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 59
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -283,7 +227,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 59
+                      "column": 50
                     }
                   }
                 },
@@ -383,35 +327,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -419,7 +335,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 40
+                      "column": 33
                     }
                   }
                 },
@@ -519,35 +435,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -555,7 +443,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt
index 3de23241231abe4a22feaf2544a1ab9536560ae0..df58330bd063a5f0ddc5bb2fe0e9bd1a5917bd33 100644
--- a/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 32
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 36
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 32
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 43
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 43
+                              "column": 36
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 43
+                            "column": 36
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 43
+                          "column": 36
                         }
                       }
                     },
@@ -241,41 +213,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 43
+                        "column": 36
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 50
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 46
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 59
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -283,7 +227,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 59
+                      "column": 50
                     }
                   }
                 },
@@ -383,35 +327,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -419,7 +335,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 40
+                      "column": 33
                     }
                   }
                 },
@@ -519,35 +435,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -555,7 +443,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt
index 0ba38e9c454ea16ad44aa62ab83f66491b40e8a6..0d0c29ab581a70a0ab60c145172ca7a25ebf2b79 100644
--- a/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 32
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 36
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 32
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 43
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 43
+                              "column": 36
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 43
+                            "column": 36
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 43
+                          "column": 36
                         }
                       }
                     },
@@ -241,41 +213,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 43
+                        "column": 36
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 50
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 46
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 59
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -283,7 +227,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 59
+                      "column": 50
                     }
                   }
                 },
@@ -383,35 +327,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -419,7 +335,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 40
+                      "column": 33
                     }
                   }
                 },
@@ -519,35 +435,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -555,7 +443,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt
index 17c45c9a59bf943bd638aaad99d84235e758c33f..c714e1824d09e0108e2e8a218e4f2a8f8958270b 100644
--- a/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -124,7 +96,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -136,7 +108,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -147,41 +119,13 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 50
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -189,7 +133,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 50
+                      "column": 41
                     }
                   }
                 },
@@ -520,35 +464,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -556,7 +472,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -656,35 +572,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -692,7 +580,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt
index 71d276a37d6b589b08fe2863b803ca871177e27a..870bdb61a668fa875c46822a295ed75789674289 100644
--- a/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -124,7 +96,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -136,7 +108,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -147,41 +119,13 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 50
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -189,7 +133,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 50
+                      "column": 41
                     }
                   }
                 },
@@ -520,35 +464,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -556,7 +472,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -656,35 +572,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -692,7 +580,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt
index c555782cc152848edd8ef3c9e6271579ca895435..4e6788abc0c9c42db325a810ef7364b58709e6aa 100644
--- a/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt
+++ b/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -124,7 +96,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -136,7 +108,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -147,41 +119,13 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 50
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -189,7 +133,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 50
+                      "column": 41
                     }
                   }
                 },
@@ -520,35 +464,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -556,7 +472,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -656,35 +572,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -692,7 +580,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/return_missing_argument-expected.txt b/ets2panda/test/compiler/ets/return_missing_argument-expected.txt
index c1f2ba317286b852995723ca6f6438928803ef15..4f04d2781bc332d74e4ebb287bffb989dd9002ec 100644
--- a/ets2panda/test/compiler/ets/return_missing_argument-expected.txt
+++ b/ets2panda/test/compiler/ets/return_missing_argument-expected.txt
@@ -355,35 +355,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -391,7 +363,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/setArrayLength1-expected.txt b/ets2panda/test/compiler/ets/setArrayLength1-expected.txt
index df6abda8adaa59f33375167c80fd2c1300d8de28..00ab3e2661744e85a946be4bac3c9a745fc42441 100644
--- a/ets2panda/test/compiler/ets/setArrayLength1-expected.txt
+++ b/ets2panda/test/compiler/ets/setArrayLength1-expected.txt
@@ -418,35 +418,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -454,7 +426,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/setArrayLength2-expected.txt b/ets2panda/test/compiler/ets/setArrayLength2-expected.txt
index 318aa2a263a8d1bde79041a27204c6e60f78ec74..c1e777fff080695acdd1c540c1078f2e570c4bec 100644
--- a/ets2panda/test/compiler/ets/setArrayLength2-expected.txt
+++ b/ets2panda/test/compiler/ets/setArrayLength2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/setArrayLength3-expected.txt b/ets2panda/test/compiler/ets/setArrayLength3-expected.txt
index b5b23584d5e0d68c82ddab5795ae332d1f7705b2..ca0839dbc904b3439a554ca63fd060e0a6337b48 100644
--- a/ets2panda/test/compiler/ets/setArrayLength3-expected.txt
+++ b/ets2panda/test/compiler/ets/setArrayLength3-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt
index f5a81fbd1934a113053aa29a82de54e32f03ce80..e45fe1d03d81e01b3dd6efa56bb9b6602df9db6a 100644
--- a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt
+++ b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 17
+                      "column": 16
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt b/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt
index f893cf2cf947f21eb13ee07d5a94113356a00a8a..d6a5b59f35a572d1af032f0b3b23d61134bf810a 100644
--- a/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt
+++ b/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 17
+                      "column": 16
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt
index fe84199b44a7a675da62f399823d696c207b1160..0a7f3ca08adbb83af0a7a612ac06f5b4f5ccbf0b 100644
--- a/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt
index 6e15c36e97fcc063ce6fa8d39225b27b0b57210c..8387dc209434a9bcbbda770c2ae089a43e4c32a7 100644
--- a/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt
index 290f684c71420e61db0db36bb6e4524130924a63..7fe1a942ece8ca851000ffa960ab344da902c3f6 100644
--- a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt
index 584492491982d26c9cedd1da85fb73f70bd78de5..2a45d1d0ba1e9eeeba9072e0e2b023ce4d7829ea 100644
--- a/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt
index 87863e0ede8b6011a13caebb3933f13b2b31b400..65c952ed778d11b5f355bc67451edb3f4e60c148 100644
--- a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt
index ece49498846b7bbde14a68afb7c184e91e006a4b..5ec434063beb0abb5ed85c5e90c20b990e20ee90 100644
--- a/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt b/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt
index 357c335845b9738ddd318e23e3d8fa854f174742..74da48242d3ead6552196b43b6402777b324c154 100644
--- a/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 32
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 36
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 32
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 43
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 43
+                              "column": 36
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 43
+                            "column": 36
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 43
+                          "column": 36
                         }
                       }
                     },
@@ -241,41 +213,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 43
+                        "column": 36
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 50
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 46
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 59
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -283,7 +227,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 59
+                      "column": 50
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt b/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt
index 392812d426f2e05bc298cc5276047d9b512cb850..0be83ab771067e965d096b32cc77faa2d54625de 100644
--- a/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 34
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 38
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 34
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 45
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 45
+                              "column": 38
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 45
+                            "column": 38
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 45
+                          "column": 38
                         }
                       }
                     },
@@ -241,7 +213,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 45
+                        "column": 38
                       }
                     }
                   }
diff --git a/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt b/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt
index f84d9a6e84023b1a8e9a287373d31863b6d35cda..44ba1f65ece173ce3efd1c1d5aeccc787543da17 100644
--- a/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt
index 5dee768bca29058c31c06f4873703e188e3dc92e..5be3175f2f5e938137eb3c3e9cfdb7a1779bd939 100644
--- a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt
+++ b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt b/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt
index 3d916950b58552978809bcfa5f4881f8e8e686b2..e8897685d2a5e46622f46c919fb208e8871729aa 100644
--- a/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt
+++ b/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt b/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt
index f03d10b7662ba57b00a78a14d684746ad3f9d8bb..0ea7b524b7aef0edb56fc1dcf98617718a6ac594 100644
--- a/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt
@@ -301,35 +301,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -337,7 +309,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt b/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt
index f0c6ef0b95323f1caa7012db04a52829a26cfd94..319eca7bd1467b51c7fe576a4c6e120fa7374f52 100644
--- a/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt
@@ -301,35 +301,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -337,7 +309,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt
index 46bd51fe7928f3258087a4a315ba980e754df7e9..ac0ee15676d17ad48b7656fe21bd0101daa1c6ce 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 37
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 41
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 37
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 48
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 48
+                              "column": 41
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 48
+                            "column": 41
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 48
+                          "column": 41
                         }
                       }
                     },
@@ -241,41 +213,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 48
+                        "column": 41
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 51
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 55
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 51
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 64
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -283,7 +227,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 64
+                      "column": 55
                     }
                   }
                 },
@@ -435,35 +379,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 38
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 42
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 38
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 49
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 20,
@@ -471,7 +387,7 @@
                             },
                             "end": {
                               "line": 20,
-                              "column": 49
+                              "column": 42
                             }
                           }
                         }
@@ -483,7 +399,7 @@
                           },
                           "end": {
                             "line": 20,
-                            "column": 49
+                            "column": 42
                           }
                         }
                       },
@@ -495,7 +411,7 @@
                         },
                         "end": {
                           "line": 20,
-                          "column": 49
+                          "column": 42
                         }
                       }
                     },
@@ -506,41 +422,13 @@
                       },
                       "end": {
                         "line": 20,
-                        "column": 49
+                        "column": 42
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 52
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 56
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 52
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 58
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -548,7 +436,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 58
+                      "column": 56
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt
index 530cca0f11f1c332778eea9011d973b263736d18..d1ec297ae9ef3109d608d2a3a5b1c30c6a18ace0 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 38
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 42
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 38
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 49
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 49
+                              "column": 42
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 49
+                            "column": 42
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 49
+                          "column": 42
                         }
                       }
                     },
@@ -241,41 +213,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 49
+                        "column": 42
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 52
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 56
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 52
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 58
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -283,7 +227,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 58
+                      "column": 56
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt
index 14b1a16a4052ff3326d0faf4d09ed45a02c3c214..ba795e8b7ca787c71dbac417d0fa984995b90313 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt
@@ -235,35 +235,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -271,7 +243,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt
index b021724c4cb4cb77e5bd78eba8ab871f4e205585..b92ba66ca1e51e394424ae7f639bb1a45f28a19f 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -298,35 +270,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -334,7 +278,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt
index 3a20bd23e476bfff0a3202e35dd83b9e0083d1f7..951c758e5b612cf59016824043f51b60ae19f78c 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt
@@ -163,35 +163,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -199,7 +171,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -436,35 +408,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -472,7 +416,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -859,35 +803,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -895,7 +811,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt
index 1a6d0916faac1b34691c17430898575663c4ac0e..7acb74c3d2bf20114f7368852769f10ae66ddf2a 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -367,35 +339,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -403,7 +347,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt
index 5ee1cbf0cee61db72fdac8fcfc74ed513b72ca9d..5c30274410f5ba03eff114468e761b0067c8bccf 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -367,35 +339,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -403,7 +347,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt
index b4ef010fdc421d434c58086aa6a64fc2b1d38f18..37826bef35a0f376f42f69196c2dbeacf0ef7b2e 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 28
+                      "column": 21
                     }
                   }
                 },
@@ -504,35 +476,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -540,7 +484,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -709,35 +653,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -745,7 +661,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt
index f718f3201c948194662474946e8074ce86f7a0c4..8b43ed99ef51aad6a18d4874a5c8710f8e8e1256 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt
@@ -22,35 +22,7 @@
         "type": "ETSFunctionType",
         "params": [],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 24
-                },
-                "end": {
-                  "line": 16,
-                  "column": 28
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 24
-              },
-              "end": {
-                "line": 16,
-                "column": 35
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
@@ -58,7 +30,7 @@
             },
             "end": {
               "line": 16,
-              "column": 35
+              "column": 28
             }
           }
         }
@@ -70,7 +42,7 @@
           },
           "end": {
             "line": 16,
-            "column": 35
+            "column": 28
           }
         }
       },
@@ -246,35 +218,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -282,7 +226,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -360,35 +304,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 26
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 30
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 26
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 33
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 19,
@@ -396,7 +312,7 @@
                                   },
                                   "end": {
                                     "line": 19,
-                                    "column": 33
+                                    "column": 30
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt
index ce9c188d831d6be514ede021881f0647605211fe..02dc5c60cf9c31ef986daf15259edd6a5e09ef71 100644
--- a/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt
@@ -22,35 +22,7 @@
         "type": "ETSFunctionType",
         "params": [],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 24
-                },
-                "end": {
-                  "line": 16,
-                  "column": 28
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 24
-              },
-              "end": {
-                "line": 16,
-                "column": 35
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
@@ -58,7 +30,7 @@
             },
             "end": {
               "line": 16,
-              "column": 35
+              "column": 28
             }
           }
         }
@@ -70,7 +42,7 @@
           },
           "end": {
             "line": 16,
-            "column": 35
+            "column": 28
           }
         }
       },
@@ -246,35 +218,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -282,7 +226,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -360,35 +304,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 26
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 30
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 26
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 33
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 19,
@@ -396,7 +312,7 @@
                                   },
                                   "end": {
                                     "line": 19,
-                                    "column": 33
+                                    "column": 30
                                   }
                                 }
                               },
diff --git a/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt b/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt
index fecebb453782ee6c952dab6e475796801d0613a1..afd11f04997f46bbcefd204e96abac39e32e7bd3 100644
--- a/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 28
+                      "column": 21
                     }
                   }
                 },
@@ -504,35 +476,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -540,7 +484,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt b/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt
index 190801377847e930cc412ae02b44ba00f611c515..6928e531d7f821a231fea9b6847651298c825b40 100644
--- a/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt
+++ b/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 28
+                      "column": 21
                     }
                   }
                 },
@@ -504,35 +476,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -540,7 +484,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt
index 28e07c4b0f1b21bb133d973909b07851caec4d5c..7484d7638f2f0761b464b9f0f6c58578e4aa8426 100644
--- a/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt
index c712b18652a0c1a12e9f7da72dd2c56a01b9da74..aa79e4f856ea6df36937ee9ba040e0635f403ce8 100644
--- a/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt
index f683fe867d1838e1fea3e0d27ca52eb2faa5e769..24c1a1ccf693f0ce884cee1c56dc4b8bf34fe05b 100644
--- a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt b/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt
index 683edb16ab5c95111692feae625e6fb5f6cb6ede..ba40f9c934ccdfc9959edca397ecf1b22e3a4279 100644
--- a/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt
index 435bd1ee067934b9e076d90f8b8c20d76205189c..a56345052cc8ee7924248bf4b4c205e72115c6b3 100644
--- a/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt
index 78765b552a1f351e9a3d48c2e14a5266daf58f82..dbcceae603d370af1648bf7eaf71919aee1a58d4 100644
--- a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt
+++ b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt
index 4bc13bc8159dd2a8e2a4c44fb7afe9c58d337250..c1449726a7f9ddd7d553968c93b7681d1bc666dc 100644
--- a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt
+++ b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt
index 1fa7dad85ccf7b373d40cfabfe8231e8d165d1e1..daf11b4c0889f99ef3d6b9f918c132d1ca6c27c9 100644
--- a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt
@@ -1297,35 +1297,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -1333,7 +1305,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt
index 7f3a1736aab48579ebf17c752c738a584f5fd706..510b0a58e15531a69ee483be75c60cf9d96c730a 100644
--- a/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt
index 999b175e3a065c110cd895d35d7f978a58b0c4b1..d73ef6b2bf87aba40dc93bc3f18496b4d6b44376 100644
--- a/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt
index 19124a264bc8b876bc2b360fc99ea265c1ec0f3f..9f6b0f07de12fa7a19019e718cc8d117abf55cb6 100644
--- a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt
@@ -762,35 +762,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -798,7 +770,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt
index fa310986d8a254bb9dca205b7a55a77ebe934ef5..a6eabf66f6e463eead09469a5f8a5d60efdef906 100644
--- a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt
@@ -258,35 +258,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -294,7 +266,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -816,35 +788,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -852,7 +796,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt
index 754f6acb255ba185d3da9537fb9053c1665b2011..ae5660de8c7de6bb1a74dd46a68bb6b742ed3e7a 100644
--- a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt
@@ -666,35 +666,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -702,7 +674,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt
index ed97776aece3afabf4541668951cfbbd80036748..97d11121c99f01f23c3e6bb885e401c326feb103 100644
--- a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt
@@ -92,43 +92,15 @@
           }
         ],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 33
-                },
-                "end": {
-                  "line": 16,
-                  "column": 37
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 33
-              },
-              "end": {
-                "line": 17,
-                "column": 5
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
               "column": 33
             },
             "end": {
-              "line": 17,
-              "column": 5
+              "line": 16,
+              "column": 37
             }
           }
         },
@@ -138,8 +110,8 @@
             "column": 14
           },
           "end": {
-            "line": 17,
-            "column": 5
+            "line": 16,
+            "column": 37
           }
         }
       },
@@ -175,35 +147,7 @@
         "type": "ETSFunctionType",
         "params": [],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 17,
-                  "column": 20
-                },
-                "end": {
-                  "line": 17,
-                  "column": 24
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 17,
-                "column": 20
-              },
-              "end": {
-                "line": 17,
-                "column": 25
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 17,
@@ -211,7 +155,7 @@
             },
             "end": {
               "line": 17,
-              "column": 25
+              "column": 24
             }
           }
         },
@@ -222,7 +166,7 @@
           },
           "end": {
             "line": 17,
-            "column": 25
+            "column": 24
           }
         }
       },
@@ -691,35 +635,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -727,7 +643,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt
index 9ed30ce235a5fc15625b543517da5111b31314ff..7ecd55257eb71afe62450d24c2a413e253c9efea 100644
--- a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt
@@ -288,35 +288,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -324,7 +296,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt
index ebe6fc8aab0430bd1258bc40e988200307b78fb7..656b904c190bf2fa5986b64b9409dedd1824a309 100644
--- a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt
@@ -330,35 +330,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -366,7 +338,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt
index b32a3a2104acb7fab23c9cf75758e03fd233c55c..d4d6044506aa982c209b826007b5295208601e4c 100644
--- a/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt
index cca4b7497d07671b2c9efd6f0d0039a535eaeafc..8618e5e3ec245e43661d37cd7d3af2f824213a9f 100644
--- a/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt
index db9deb2371bc0cb683e83701cdb22bc5022e2fb0..27731bd1cd4b2bd22fc326cf9bd72a6b082aff1f 100644
--- a/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt
index c17eebbf4d311a0cf910e149a5ab435eab8088d2..421b533acb7b281f3527f1d489f835ca8e931a1d 100644
--- a/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt
index 01342b3043190796795c718862a79fccfe61600f..2939326cc6222ee8830d3f557ee73d604780fd9a 100644
--- a/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt
index 1793aff6858ff7283910686fc9066fa3998a9daa..5bc97ab97c6493a736524401da490742fceb3530 100644
--- a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_8-expected.txt b/ets2panda/test/compiler/ets/tuple_types_8-expected.txt
index 5443c594f1e4a36e3517d28c026c449d6ffac225..faf1a223b806fb932b75c145c5ba3e574da0f641 100644
--- a/ets2panda/test/compiler/ets/tuple_types_8-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_8-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt
index 959d61e1011afa27a0a0ced8f375374fdc2c4a61..d929cbbc51a9e8d821155c39ff08ca99ac2aa4d7 100644
--- a/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt
+++ b/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/union_types_5-expected.txt b/ets2panda/test/compiler/ets/union_types_5-expected.txt
index 3a041975ac79846e59708c3e456c28967f60f1c1..718a439e686d9226dd4bb4315b5cff0d3b4539e8 100644
--- a/ets2panda/test/compiler/ets/union_types_5-expected.txt
+++ b/ets2panda/test/compiler/ets/union_types_5-expected.txt
@@ -2278,35 +2278,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 46,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 46,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 46,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 46,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 46,
@@ -2314,7 +2286,7 @@
                     },
                     "end": {
                       "line": 46,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt
index ae620a89c879497edb80a5f57152f061cb706552..2a10202db1660e1d897bb5969020ae2fe21fe381 100644
--- a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt
+++ b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt
index 1b7c8798937e4356b5ec0d841c26f19d393598a2..a7d72663d675d45dd519d3166eaa71487b6a1b3a 100644
--- a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt
+++ b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt b/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt
index b434ae012cb969a610d026fa49e92884441b5d35..f72919bbacf14fc96b705999cd90e24bc57945e8 100644
--- a/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt
+++ b/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -297,35 +269,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -333,7 +277,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -494,4 +438,4 @@
     }
   }
 }
-TypeError: An expression of type 'void' cannot be tested for truthiness [voidTypeInBinaryOperation.ets:20:19]
+TypeError: Bad operand type, the types of the operands must be of possible condition type. [voidTypeInBinaryOperation.ets:20:10]
diff --git a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt
index d5501d37a78b4b9f0ffdf8acd77fb4c6087cdaf2..fbec2a9034ec6ac3443a829ce70607235310757e 100644
--- a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt
+++ b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt
@@ -2327,35 +2327,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 51,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 51,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 51,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 51,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 51,
@@ -2363,7 +2335,7 @@
                     },
                     "end": {
                       "line": 51,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -4808,35 +4780,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 79,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 79,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 79,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 79,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 79,
@@ -4844,7 +4788,7 @@
                     },
                     "end": {
                       "line": 79,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt
index bf878c72fa03e37a869114189c2edde404646afe..8f73d986b7cf339393f6a97fc06e866446ee19f4 100644
--- a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt
+++ b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt
@@ -4825,35 +4825,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 84,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 84,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 84,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 84,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 84,
@@ -4861,7 +4833,7 @@
                     },
                     "end": {
                       "line": 84,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -5346,35 +5318,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 90,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 90,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 90,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 90,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 90,
@@ -5382,7 +5326,7 @@
                     },
                     "end": {
                       "line": 90,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/AccessNBody-expected.txt b/ets2panda/test/parser/ets/AccessNBody-expected.txt
index 068b84444be6b15f224b93399867d68cccc4efd4..02f26f447134d8b44ac1481a5a712d703f83379b 100644
--- a/ets2panda/test/parser/ets/AccessNBody-expected.txt
+++ b/ets2panda/test/parser/ets/AccessNBody-expected.txt
@@ -4078,35 +4078,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 64,
-                          "column": 36
-                        },
-                        "end": {
-                          "line": 64,
-                          "column": 40
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 64,
-                        "column": 36
-                      },
-                      "end": {
-                        "line": 64,
-                        "column": 42
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 64,
@@ -4114,7 +4086,7 @@
                     },
                     "end": {
                       "line": 64,
-                      "column": 42
+                      "column": 40
                     }
                   }
                 },
@@ -13606,35 +13578,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 140,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 140,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 140,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 140,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 140,
@@ -13642,7 +13586,7 @@
                     },
                     "end": {
                       "line": 140,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -15407,35 +15351,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 156,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 156,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 156,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 156,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 156,
@@ -15443,7 +15359,7 @@
                     },
                     "end": {
                       "line": 156,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/AccessNSieve-expected.txt b/ets2panda/test/parser/ets/AccessNSieve-expected.txt
index e9379ad0e68b659f0e6efe5606a982a1314bc11a..7638c0a7f0b27ff89b927e51821b15111c36fdbc 100644
--- a/ets2panda/test/parser/ets/AccessNSieve-expected.txt
+++ b/ets2panda/test/parser/ets/AccessNSieve-expected.txt
@@ -319,35 +319,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -355,7 +327,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -2591,35 +2563,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 53,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 53,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 53,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 53,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 53,
@@ -2627,7 +2571,7 @@
                     },
                     "end": {
                       "line": 53,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -3176,35 +3120,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 59,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 59,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 59,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 59,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 59,
@@ -3212,7 +3128,7 @@
                     },
                     "end": {
                       "line": 59,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt
index a298f24c52b74b3278008473dccf4b51f0f2f877..f4aad7a9711901e6921fcddfee5f217063145086 100644
--- a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt
+++ b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt
@@ -1074,35 +1074,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -1110,7 +1082,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -2133,35 +2105,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 41,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 41,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 41,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 41,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 41,
@@ -2169,7 +2113,7 @@
                     },
                     "end": {
                       "line": 41,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt
index dd67845c62470f0b84d2c2dcf4779e29c60d5636..215124ba275186e6e6f809fa04e0e5509aa7292a 100644
--- a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt
+++ b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt
@@ -848,35 +848,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 33,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 33,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 33,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 33,
@@ -884,7 +856,7 @@
                     },
                     "end": {
                       "line": 33,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -1907,35 +1879,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 44,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 44,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 44,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 44,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 44,
@@ -1943,7 +1887,7 @@
                     },
                     "end": {
                       "line": 44,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt
index d9d3f5b4cc96b7c69151f5322ff837966c350543..d4747bb310857f606e3282b263a7098fbb0852ed 100644
--- a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt
+++ b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt
@@ -194,35 +194,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -230,7 +202,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -1020,35 +992,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -1056,7 +1000,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt
index 6e174ce74bed36e52d83d3388896a99a5954eadf..bd39afb2f68a129bf6e753592376acf50a3b046a 100644
--- a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt
+++ b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt
@@ -205,35 +205,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 52
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 56
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 52
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 58
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -241,7 +213,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 58
+                      "column": 56
                     }
                   }
                 },
@@ -2388,35 +2360,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 46,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 46,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 46,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 46,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 46,
@@ -2424,7 +2368,7 @@
                     },
                     "end": {
                       "line": 46,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -3434,35 +3378,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 57,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 57,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 57,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 57,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 57,
@@ -3470,7 +3386,7 @@
                     },
                     "end": {
                       "line": 57,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt
index fc46c2282bafbaccfa873f05e68c5a136e9c311e..069cc6d9a4bcb34a569c85e2276eb311f801bdde 100644
--- a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt
+++ b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt
index 5a053da53e353202d757f71054ec7a9d8c74bf2a..17ec672e2d6e888b875e74bccc007806d1b9f64e 100644
--- a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt
+++ b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt
@@ -2308,35 +2308,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 45,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 45,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 45,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 45,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 45,
@@ -2344,7 +2316,7 @@
                     },
                     "end": {
                       "line": 45,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -3647,35 +3619,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 57,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 57,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 57,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 57,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 57,
@@ -3683,7 +3627,7 @@
                     },
                     "end": {
                       "line": 57,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt
index 43188a188ab441342e467771d57b657272a91d01..340e758cc9239aa8b09da99ed3a2ec3c058614d5 100644
--- a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt
+++ b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt
@@ -437,35 +437,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 55
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 59
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 55
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 61
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -473,7 +445,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 61
+                      "column": 59
                     }
                   }
                 },
@@ -572,35 +544,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -608,7 +552,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 18
+                      "column": 16
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/FunctionType-expected.txt b/ets2panda/test/parser/ets/FunctionType-expected.txt
index 051ecf2aa9ba66bce0629e4cfa1a0f047d63f03c..cc4114be8037a7955c195ed79d77ac98eb80b877 100644
--- a/ets2panda/test/parser/ets/FunctionType-expected.txt
+++ b/ets2panda/test/parser/ets/FunctionType-expected.txt
@@ -132,35 +132,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 31
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 24,
-                      "column": 27
-                    },
-                    "end": {
-                      "line": 24,
-                      "column": 32
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 24,
@@ -168,7 +140,7 @@
                   },
                   "end": {
                     "line": 24,
-                    "column": 32
+                    "column": 31
                   }
                 }
               },
@@ -179,7 +151,7 @@
                 },
                 "end": {
                   "line": 24,
-                  "column": 32
+                  "column": 31
                 }
               }
             },
@@ -192,7 +164,7 @@
               },
               "end": {
                 "line": 24,
-                "column": 32
+                "column": 31
               }
             }
           },
@@ -732,35 +704,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 24
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 28
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 24
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 29
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 19,
@@ -768,7 +712,7 @@
                             },
                             "end": {
                               "line": 19,
-                              "column": 29
+                              "column": 28
                             }
                           }
                         },
@@ -779,7 +723,7 @@
                           },
                           "end": {
                             "line": 19,
-                            "column": 29
+                            "column": 28
                           }
                         }
                       },
@@ -791,7 +735,7 @@
                         },
                         "end": {
                           "line": 19,
-                          "column": 29
+                          "column": 28
                         }
                       }
                     },
@@ -802,7 +746,7 @@
                       },
                       "end": {
                         "line": 19,
-                        "column": 29
+                        "column": 28
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt
index d9ec76360b16e293728556a7f624eaf5f3de9119..fbbb1f55f09df80e83e716a0d71eba245d281a93 100644
--- a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt
+++ b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt
@@ -231,35 +231,7 @@
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 42
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 46
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 42
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 47
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -267,7 +239,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 47
+                              "column": 46
                             }
                           }
                         },
@@ -278,7 +250,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 47
+                            "column": 46
                           }
                         }
                       }
diff --git a/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt b/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt
index 95121089560b9b55ccd7cc7f4c398ee7e0a43395..999094778ce2d0f5a09581ff9f4616dc12ccbba8 100644
--- a/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt
+++ b/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt
@@ -927,35 +927,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -963,7 +935,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/MathCordic-expected.txt b/ets2panda/test/parser/ets/MathCordic-expected.txt
index 56e1b883227409c26f070ad2413545b234710af2..600f5588e2e01b8dd7eb4380ae6017cbf31eabef 100644
--- a/ets2panda/test/parser/ets/MathCordic-expected.txt
+++ b/ets2panda/test/parser/ets/MathCordic-expected.txt
@@ -4688,35 +4688,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 70,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 70,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 70,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 70,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 70,
@@ -4724,7 +4696,7 @@
                     },
                     "end": {
                       "line": 70,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -5401,35 +5373,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 78,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 78,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 78,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 78,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 78,
@@ -5437,7 +5381,7 @@
                     },
                     "end": {
                       "line": 78,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/MathPartialSums-expected.txt b/ets2panda/test/parser/ets/MathPartialSums-expected.txt
index 23eb4fa4753baadc7c0603ec692e79ba95aacab8..5203c78f1fd29ea5b18e102e6c620d87930325bc 100644
--- a/ets2panda/test/parser/ets/MathPartialSums-expected.txt
+++ b/ets2panda/test/parser/ets/MathPartialSums-expected.txt
@@ -3862,35 +3862,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 72,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 72,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 72,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 72,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 72,
@@ -3898,7 +3870,7 @@
                     },
                     "end": {
                       "line": 72,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -4953,35 +4925,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 83,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 83,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 83,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 83,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 83,
@@ -4989,7 +4933,7 @@
                     },
                     "end": {
                       "line": 83,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt
index 2c9560bd208fa1b6efacdbb852355181094ec775..a5e9ad21486853aae237ca3bc602fa8466c980f5 100644
--- a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt
+++ b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt
@@ -624,35 +624,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 50
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 54
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 50
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 56
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -660,7 +632,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 56
+                      "column": 54
                     }
                   }
                 },
@@ -1625,35 +1597,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 31,
-                          "column": 51
-                        },
-                        "end": {
-                          "line": 31,
-                          "column": 55
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 31,
-                        "column": 51
-                      },
-                      "end": {
-                        "line": 31,
-                        "column": 57
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 31,
@@ -1661,7 +1605,7 @@
                     },
                     "end": {
                       "line": 31,
-                      "column": 57
+                      "column": 55
                     }
                   }
                 },
@@ -2680,35 +2624,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 41,
-                          "column": 65
-                        },
-                        "end": {
-                          "line": 41,
-                          "column": 69
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 41,
-                        "column": 65
-                      },
-                      "end": {
-                        "line": 41,
-                        "column": 71
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 41,
@@ -2716,7 +2632,7 @@
                     },
                     "end": {
                       "line": 41,
-                      "column": 71
+                      "column": 69
                     }
                   }
                 },
@@ -5179,35 +5095,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 80,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 80,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 80,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 80,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 80,
@@ -5215,7 +5103,7 @@
                     },
                     "end": {
                       "line": 80,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -6079,35 +5967,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 91,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 91,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 91,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 91,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 91,
@@ -6115,7 +5975,7 @@
                     },
                     "end": {
                       "line": 91,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/Morph3d-expected.txt b/ets2panda/test/parser/ets/Morph3d-expected.txt
index e5929d51a22301e09c8b302a1d222082630f165a..c9daaacefa3274327acf87470836160e111c0794 100644
--- a/ets2panda/test/parser/ets/Morph3d-expected.txt
+++ b/ets2panda/test/parser/ets/Morph3d-expected.txt
@@ -328,35 +328,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -364,7 +336,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -1142,35 +1114,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -1178,7 +1122,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -2439,35 +2383,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 43,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 43,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 43,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 43,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 43,
@@ -2475,7 +2391,7 @@
                     },
                     "end": {
                       "line": 43,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -3905,35 +3821,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 60,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 60,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 60,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 60,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 60,
@@ -3941,7 +3829,7 @@
                     },
                     "end": {
                       "line": 60,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/StringBase64-expected.txt b/ets2panda/test/parser/ets/StringBase64-expected.txt
index c47c0dce3208a9aa1d854197f5e92603be3803d0..8c46d0b051dc9c43280450d70fd95e1580d8baa7 100644
--- a/ets2panda/test/parser/ets/StringBase64-expected.txt
+++ b/ets2panda/test/parser/ets/StringBase64-expected.txt
@@ -9471,35 +9471,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 72,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 72,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 72,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 72,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 72,
@@ -9507,7 +9479,7 @@
                     },
                     "end": {
                       "line": 72,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -11029,35 +11001,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 88,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 88,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 88,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 88,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 88,
@@ -11065,7 +11009,7 @@
                     },
                     "end": {
                       "line": 88,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/access_modifier_2-expected.txt b/ets2panda/test/parser/ets/access_modifier_2-expected.txt
index 4ac6fb77d9fff7b1500efaa06cc07100d466339c..b7f4f5a19fdf24e62dc37c4f08d5f6f61590683c 100644
--- a/ets2panda/test/parser/ets/access_modifier_2-expected.txt
+++ b/ets2panda/test/parser/ets/access_modifier_2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/accessor_call-expected.txt b/ets2panda/test/parser/ets/accessor_call-expected.txt
index 9411c8d2ef9ed2fb940750e8bfee4393530e2041..2b34601e61de129f9cdb2eed2b4b9347dfbb0dc6 100644
--- a/ets2panda/test/parser/ets/accessor_call-expected.txt
+++ b/ets2panda/test/parser/ets/accessor_call-expected.txt
@@ -434,35 +434,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -470,7 +442,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/accessor_void-expected.txt b/ets2panda/test/parser/ets/accessor_void-expected.txt
index e05bd5637ebfb7bf289affa46658219240ad4340..08b8eef39f66a3ba2b289ce31df0376cd20e63cd 100644
--- a/ets2panda/test/parser/ets/accessor_void-expected.txt
+++ b/ets2panda/test/parser/ets/accessor_void-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 14
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 18
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 14
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 20
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 20
+                      "column": 18
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt b/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt
index 6c87709fc0d5444e5425f038a53931f2a119957a..eceef76258c2236685fb4b264b1f1dab23733b0a 100644
--- a/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt
+++ b/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt
@@ -564,35 +564,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -600,7 +572,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -757,35 +729,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 24
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 28
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 24
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 30
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 17,
@@ -793,7 +737,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 30
+                          "column": 28
                         }
                       }
                     },
@@ -905,35 +849,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -941,7 +857,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt b/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt
index 6fb45ac9a58bb9d68457777ab0df9c2d2af6d304..69932c2159e3d5904f3889dd0a03190cbee543c8 100644
--- a/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt
+++ b/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt
@@ -965,35 +965,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 43
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 47
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 43
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 49
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -1001,7 +973,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 49
+                      "column": 47
                     }
                   }
                 },
@@ -1268,35 +1240,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 43
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 47
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 43
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 49
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 17,
@@ -1304,7 +1248,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 49
+                          "column": 47
                         }
                       }
                     },
@@ -1583,35 +1527,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 18,
-                              "column": 43
-                            },
-                            "end": {
-                              "line": 18,
-                              "column": 47
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 18,
-                            "column": 43
-                          },
-                          "end": {
-                            "line": 18,
-                            "column": 49
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 18,
@@ -1619,7 +1535,7 @@
                         },
                         "end": {
                           "line": 18,
-                          "column": 49
+                          "column": 47
                         }
                       }
                     },
@@ -1731,35 +1647,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -1767,7 +1655,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt b/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt
index eaca9b0b5c8b670de976435123d9890766056d5c..32f085a73b6fb13871300052dd84127b36ac5761 100644
--- a/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt
+++ b/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt
@@ -644,35 +644,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -680,7 +652,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -837,35 +809,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 17,
-                              "column": 23
-                            },
-                            "end": {
-                              "line": 17,
-                              "column": 27
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 17,
-                            "column": 23
-                          },
-                          "end": {
-                            "line": 17,
-                            "column": 29
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 17,
@@ -873,7 +817,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 29
+                          "column": 27
                         }
                       }
                     },
@@ -985,35 +929,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -1021,7 +937,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/anonymous_class-expected.txt b/ets2panda/test/parser/ets/anonymous_class-expected.txt
index efcfb803c883d651bd6c892aa919b7f136df6cfa..50ae27c56d966cb933f6afca166aab99479e3c12 100644
--- a/ets2panda/test/parser/ets/anonymous_class-expected.txt
+++ b/ets2panda/test/parser/ets/anonymous_class-expected.txt
@@ -251,35 +251,7 @@
                         "expression": false,
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 29
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 19,
@@ -287,7 +259,7 @@
                             },
                             "end": {
                               "line": 19,
-                              "column": 29
+                              "column": 27
                             }
                           }
                         },
diff --git a/ets2panda/test/parser/ets/array-expected.txt b/ets2panda/test/parser/ets/array-expected.txt
index 94a5bd22f3afa1dc49d04edd32d2342628ce3c27..428cea1f9aeaa5290d0b1c80dd08ca7fbb8219ce 100644
--- a/ets2panda/test/parser/ets/array-expected.txt
+++ b/ets2panda/test/parser/ets/array-expected.txt
@@ -568,35 +568,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -604,7 +576,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -703,35 +675,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -739,7 +683,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -940,35 +884,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -976,7 +892,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt
index d9ff0c65bccdf4ff3e8f29a7deff02413dc370e6..002f01490788019896467046e58c23945f1383e6 100644
--- a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt
+++ b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt
@@ -545,35 +545,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -581,7 +553,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/array_creation_expression-expected.txt b/ets2panda/test/parser/ets/array_creation_expression-expected.txt
index 12151490301effd8f49acd534d283c7697b20c60..6e0ab76f0c39c0940c79638a33e251724b7f38ad 100644
--- a/ets2panda/test/parser/ets/array_creation_expression-expected.txt
+++ b/ets2panda/test/parser/ets/array_creation_expression-expected.txt
@@ -999,35 +999,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 31,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 31,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 31,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 31,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 31,
@@ -1035,7 +1007,7 @@
                     },
                     "end": {
                       "line": 31,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt
index 8f90225009fbd543bf1f352bf2a413ffb92c07f2..853ed01ea2ba69ef7786c34e550a02f80f5daa77 100644
--- a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt
+++ b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/array_new-expected.txt b/ets2panda/test/parser/ets/array_new-expected.txt
index f67a81d3760ece5e6db2ba8a17ad608d4e7725d0..f2d8cc4e4184e5de6d38acc3b8308e467feec55c 100644
--- a/ets2panda/test/parser/ets/array_new-expected.txt
+++ b/ets2panda/test/parser/ets/array_new-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/array_new_failed-expected.txt b/ets2panda/test/parser/ets/array_new_failed-expected.txt
index 7a1d50898a8ca2833466062a25840c411cdc8a80..da3dd01ef050f78f75838ea3d330ed6f7d89612e 100644
--- a/ets2panda/test/parser/ets/array_new_failed-expected.txt
+++ b/ets2panda/test/parser/ets/array_new_failed-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/array_type-expected.txt b/ets2panda/test/parser/ets/array_type-expected.txt
index d86b75cade346005dd3d2f529055dca1674a0e0b..9eda7bda03b37bb978c169fe958e057f86994c0b 100644
--- a/ets2panda/test/parser/ets/array_type-expected.txt
+++ b/ets2panda/test/parser/ets/array_type-expected.txt
@@ -454,35 +454,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 34
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 38
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 34
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -490,7 +462,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 40
+                      "column": 38
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/assert-expected.txt b/ets2panda/test/parser/ets/assert-expected.txt
index 62ea594235f42b0bc1e779f36ab92aaf81403ec5..99761adc609f8917b31ec89da7251c9b646b68a7 100644
--- a/ets2panda/test/parser/ets/assert-expected.txt
+++ b/ets2panda/test/parser/ets/assert-expected.txt
@@ -250,35 +250,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -286,7 +258,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/assign-expected.txt b/ets2panda/test/parser/ets/assign-expected.txt
index 89ce3dbfcaa36a1abdb33489da5ff8c2b95fcd1b..7a63b396404a84bdc331bc7f7f0659af1d0d329e 100644
--- a/ets2panda/test/parser/ets/assign-expected.txt
+++ b/ets2panda/test/parser/ets/assign-expected.txt
@@ -319,35 +319,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -355,7 +327,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/assign-func-expected.txt b/ets2panda/test/parser/ets/assign-func-expected.txt
index 9acaaa71d7e17739606f0832fb279a402f803b44..691b092973bc2027965452cd049a742030683464 100644
--- a/ets2panda/test/parser/ets/assign-func-expected.txt
+++ b/ets2panda/test/parser/ets/assign-func-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 27
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 31
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 27
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 32
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 32
+                              "column": 31
                             }
                           }
                         },
@@ -123,7 +95,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 32
+                            "column": 31
                           }
                         }
                       },
@@ -135,7 +107,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 32
+                          "column": 31
                         }
                       }
                     },
@@ -146,7 +118,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 32
+                        "column": 31
                       }
                     }
                   }
@@ -313,35 +285,7 @@
               "type": "ETSFunctionType",
               "params": [],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 33
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 21,
-                      "column": 29
-                    },
-                    "end": {
-                      "line": 21,
-                      "column": 34
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 21,
@@ -349,7 +293,7 @@
                   },
                   "end": {
                     "line": 21,
-                    "column": 34
+                    "column": 33
                   }
                 }
               },
@@ -360,7 +304,7 @@
                 },
                 "end": {
                   "line": 21,
-                  "column": 34
+                  "column": 33
                 }
               }
             },
@@ -373,7 +317,7 @@
               },
               "end": {
                 "line": 21,
-                "column": 34
+                "column": 33
               }
             }
           }
diff --git a/ets2panda/test/parser/ets/assignments-expected.txt b/ets2panda/test/parser/ets/assignments-expected.txt
index a23e936e229dd27f1da9aa2ba4bb7df8679d7bef..84ae73b583489e3e9e368b768e1a4bff8bfd6ca7 100644
--- a/ets2panda/test/parser/ets/assignments-expected.txt
+++ b/ets2panda/test/parser/ets/assignments-expected.txt
@@ -306,35 +306,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -342,7 +314,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/async_overload-expected.txt b/ets2panda/test/parser/ets/async_overload-expected.txt
index 5e103098465eac12ce4bc95270494443db78b42d..05cccda3c67457ee288ed6fb68fdc084c0a0c860 100644
--- a/ets2panda/test/parser/ets/async_overload-expected.txt
+++ b/ets2panda/test/parser/ets/async_overload-expected.txt
@@ -1455,35 +1455,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 33,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 33,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 33,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 33,
@@ -1491,7 +1463,7 @@
                     },
                     "end": {
                       "line": 33,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/async_with_lambda-expected.txt b/ets2panda/test/parser/ets/async_with_lambda-expected.txt
index 657afa171455554c64b5d2a5cf2dd6abbcda280e..45aab316fa6b5606294d0c11506b195fff0a5d1f 100644
--- a/ets2panda/test/parser/ets/async_with_lambda-expected.txt
+++ b/ets2panda/test/parser/ets/async_with_lambda-expected.txt
@@ -422,35 +422,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 23
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 27
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 23
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 29
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 20,
@@ -458,7 +430,7 @@
                                   },
                                   "end": {
                                     "line": 20,
-                                    "column": 29
+                                    "column": 27
                                   }
                                 }
                               },
@@ -469,7 +441,7 @@
                                 },
                                 "end": {
                                   "line": 20,
-                                  "column": 29
+                                  "column": 27
                                 }
                               }
                             },
@@ -495,35 +467,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 34
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 38
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 34
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 41
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 20,
@@ -531,7 +475,7 @@
                                   },
                                   "end": {
                                     "line": 20,
-                                    "column": 41
+                                    "column": 38
                                   }
                                 }
                               },
@@ -1635,35 +1579,7 @@
                                                       }
                                                     ],
                                                     "returnType": {
-                                                      "type": "ETSTypeReference",
-                                                      "part": {
-                                                        "type": "ETSTypeReferencePart",
-                                                        "name": {
-                                                          "type": "Identifier",
-                                                          "name": "void",
-                                                          "decorators": [],
-                                                          "loc": {
-                                                            "start": {
-                                                              "line": 34,
-                                                              "column": 65
-                                                            },
-                                                            "end": {
-                                                              "line": 34,
-                                                              "column": 69
-                                                            }
-                                                          }
-                                                        },
-                                                        "loc": {
-                                                          "start": {
-                                                            "line": 34,
-                                                            "column": 65
-                                                          },
-                                                          "end": {
-                                                            "line": 34,
-                                                            "column": 70
-                                                          }
-                                                        }
-                                                      },
+                                                      "type": "ETSPrimitiveType",
                                                       "loc": {
                                                         "start": {
                                                           "line": 34,
@@ -1671,7 +1587,7 @@
                                                         },
                                                         "end": {
                                                           "line": 34,
-                                                          "column": 70
+                                                          "column": 69
                                                         }
                                                       }
                                                     },
@@ -1682,7 +1598,7 @@
                                                       },
                                                       "end": {
                                                         "line": 34,
-                                                        "column": 70
+                                                        "column": 69
                                                       }
                                                     }
                                                   },
@@ -1694,7 +1610,7 @@
                                                     },
                                                     "end": {
                                                       "line": 34,
-                                                      "column": 70
+                                                      "column": 69
                                                     }
                                                   }
                                                 },
@@ -1705,41 +1621,13 @@
                                                   },
                                                   "end": {
                                                     "line": 34,
-                                                    "column": 70
+                                                    "column": 69
                                                   }
                                                 }
                                               }
                                             ],
                                             "returnType": {
-                                              "type": "ETSTypeReference",
-                                              "part": {
-                                                "type": "ETSTypeReferencePart",
-                                                "name": {
-                                                  "type": "Identifier",
-                                                  "name": "void",
-                                                  "decorators": [],
-                                                  "loc": {
-                                                    "start": {
-                                                      "line": 34,
-                                                      "column": 72
-                                                    },
-                                                    "end": {
-                                                      "line": 34,
-                                                      "column": 76
-                                                    }
-                                                  }
-                                                },
-                                                "loc": {
-                                                  "start": {
-                                                    "line": 34,
-                                                    "column": 72
-                                                  },
-                                                  "end": {
-                                                    "line": 34,
-                                                    "column": 79
-                                                  }
-                                                }
-                                              },
+                                              "type": "ETSPrimitiveType",
                                               "loc": {
                                                 "start": {
                                                   "line": 34,
@@ -1747,7 +1635,7 @@
                                                 },
                                                 "end": {
                                                   "line": 34,
-                                                  "column": 79
+                                                  "column": 76
                                                 }
                                               }
                                             },
diff --git a/ets2panda/test/parser/ets/await_keyword-expected.txt b/ets2panda/test/parser/ets/await_keyword-expected.txt
index 2159d4df660a84e8b58988960fd248006cbbf539..3ce41d1cf3059fb071a635b30d09cd91461096c6 100644
--- a/ets2panda/test/parser/ets/await_keyword-expected.txt
+++ b/ets2panda/test/parser/ets/await_keyword-expected.txt
@@ -1363,35 +1363,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -1399,7 +1371,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -1748,35 +1720,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 30
-                        },
-                        "end": {
-                          "line": 33,
-                          "column": 34
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 33,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 33,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 33,
@@ -1784,7 +1728,7 @@
                     },
                     "end": {
                       "line": 33,
-                      "column": 37
+                      "column": 34
                     }
                   }
                 },
@@ -2103,35 +2047,7 @@
               "type": "ETSFunctionType",
               "params": [],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 33,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 33,
-                        "column": 23
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 33,
-                      "column": 19
-                    },
-                    "end": {
-                      "line": 33,
-                      "column": 25
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 33,
@@ -2139,7 +2055,7 @@
                   },
                   "end": {
                     "line": 33,
-                    "column": 25
+                    "column": 23
                   }
                 }
               },
@@ -2150,7 +2066,7 @@
                 },
                 "end": {
                   "line": 33,
-                  "column": 25
+                  "column": 23
                 }
               }
             },
diff --git a/ets2panda/test/parser/ets/boolean_cond-expected.txt b/ets2panda/test/parser/ets/boolean_cond-expected.txt
index c5e7a595431c070ee52fc3a86c809b0298775fe8..a534335ef3a304c6a1e00ebdc1ab5fe20437d772 100644
--- a/ets2panda/test/parser/ets/boolean_cond-expected.txt
+++ b/ets2panda/test/parser/ets/boolean_cond-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/boolean_default-expected.txt b/ets2panda/test/parser/ets/boolean_default-expected.txt
index b1317a2f77050c950d5a18b1ba536b50bb467881..8bb900f742514363326439ac1521d91134652bf2 100644
--- a/ets2panda/test/parser/ets/boolean_default-expected.txt
+++ b/ets2panda/test/parser/ets/boolean_default-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/break-expected.txt b/ets2panda/test/parser/ets/break-expected.txt
index c165861131c3dca33733e7b1a729bb99e726b1c6..ecdc110b4476480e4ba5949a5e98cc1e77dfce83 100644
--- a/ets2panda/test/parser/ets/break-expected.txt
+++ b/ets2panda/test/parser/ets/break-expected.txt
@@ -324,35 +324,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -360,7 +332,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt
index 7e17bb58899f4fa1d2099e7cd134b034d8d048b7..8145663cfbee663314376e6c441a5834f565c8f3 100644
--- a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt
+++ b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/calls-expected.txt b/ets2panda/test/parser/ets/calls-expected.txt
index 58b7b6449738577e1e6ded3a9ef49061ea6bbe89..3e541366b0d8bb77156e0f0618b0d34b8e8745ca 100644
--- a/ets2panda/test/parser/ets/calls-expected.txt
+++ b/ets2panda/test/parser/ets/calls-expected.txt
@@ -604,35 +604,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -640,7 +612,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions-expected.txt b/ets2panda/test/parser/ets/cast_expressions-expected.txt
index 9d787e3515c8a646761b8ef9fb751e0378698c13..18352943f5e79accfa1be622d5bd782f8b50b585 100644
--- a/ets2panda/test/parser/ets/cast_expressions-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -1194,35 +1166,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -1230,7 +1174,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -3056,35 +3000,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 57,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 57,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 57,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 57,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 57,
@@ -3092,7 +3008,7 @@
                     },
                     "end": {
                       "line": 57,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -4833,35 +4749,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 86,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 86,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 86,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 86,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 86,
@@ -4869,7 +4757,7 @@
                     },
                     "end": {
                       "line": 86,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -6610,35 +6498,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 115,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 115,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 115,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 115,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 115,
@@ -6646,7 +6506,7 @@
                     },
                     "end": {
                       "line": 115,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
@@ -8302,35 +8162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 143,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 143,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 143,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 143,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 143,
@@ -8338,7 +8170,7 @@
                     },
                     "end": {
                       "line": 143,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -9909,35 +9741,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 170,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 170,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 170,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 170,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 170,
@@ -9945,7 +9749,7 @@
                     },
                     "end": {
                       "line": 170,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -11431,35 +11235,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 196,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 196,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 196,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 196,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 196,
@@ -11467,7 +11243,7 @@
                     },
                     "end": {
                       "line": 196,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
@@ -12868,35 +12644,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 221,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 221,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 221,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 221,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 221,
@@ -12904,7 +12652,7 @@
                     },
                     "end": {
                       "line": 221,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions10-expected.txt b/ets2panda/test/parser/ets/cast_expressions10-expected.txt
index abe87272b578c64a1967a73a65872a4626db4f02..675a2ef3ed8604f501c601acab2250f9654afbb8 100644
--- a/ets2panda/test/parser/ets/cast_expressions10-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions10-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions2-expected.txt b/ets2panda/test/parser/ets/cast_expressions2-expected.txt
index 049b371ae5d9b943b538533b63ce572a2545f288..ce5e20b348582261e26bfd1fdca0dca50e223fca 100644
--- a/ets2panda/test/parser/ets/cast_expressions2-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions2-expected.txt
@@ -436,35 +436,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 38
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 42
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 38
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 44
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -472,7 +444,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 44
+                      "column": 42
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions3-expected.txt b/ets2panda/test/parser/ets/cast_expressions3-expected.txt
index f62c2b75486324ab4818a321fe49d473b5c969c4..7de2b73f5af3eb81ef1877660a61af9d099c57ce 100644
--- a/ets2panda/test/parser/ets/cast_expressions3-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions3-expected.txt
@@ -751,35 +751,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 43
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -787,7 +759,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 43
+                      "column": 41
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions4-expected.txt b/ets2panda/test/parser/ets/cast_expressions4-expected.txt
index eae98bf4d811b61b135ccab3c3b8e0b1d4e5ae4f..5b61e4ac100fcb3d1bfc1a1d7d04f59869d6e7bd 100644
--- a/ets2panda/test/parser/ets/cast_expressions4-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions4-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions5-expected.txt b/ets2panda/test/parser/ets/cast_expressions5-expected.txt
index d8a3a2b217d8f3854979e80bd5d1110a4dd80f79..fd910ffa41d9408ab3c6d8a3f02e31deec70411d 100644
--- a/ets2panda/test/parser/ets/cast_expressions5-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions5-expected.txt
@@ -117,35 +117,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 19
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -153,7 +125,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 19
+                      "column": 17
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions6-expected.txt b/ets2panda/test/parser/ets/cast_expressions6-expected.txt
index 90118201406286af242ed40837bf99fcf1e8b79b..4471c5fa6c5d224b94247e4c714dfcf04e26a880 100644
--- a/ets2panda/test/parser/ets/cast_expressions6-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions6-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions7-expected.txt b/ets2panda/test/parser/ets/cast_expressions7-expected.txt
index 6fe26ccff26bf4713333e7bbcca0cd429d3ae334..dd9a166df458a9b8b9fc890b27e5321818813cc4 100644
--- a/ets2panda/test/parser/ets/cast_expressions7-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions7-expected.txt
@@ -476,35 +476,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -512,7 +484,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions8-expected.txt b/ets2panda/test/parser/ets/cast_expressions8-expected.txt
index 7ae471b150eb3d7513c3c3a1184ac9f667be99b3..79c8c35503948d3907c0bf16b43c7db624287957 100644
--- a/ets2panda/test/parser/ets/cast_expressions8-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions8-expected.txt
@@ -476,35 +476,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -512,7 +484,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/cast_expressions9-expected.txt b/ets2panda/test/parser/ets/cast_expressions9-expected.txt
index 4eb28ca4f919fc9f4bced0ab46b146830efb9535..c19cf1255b330594e2fbce764cace3ba0f5abc99 100644
--- a/ets2panda/test/parser/ets/cast_expressions9-expected.txt
+++ b/ets2panda/test/parser/ets/cast_expressions9-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/class_composite_1-expected.txt b/ets2panda/test/parser/ets/class_composite_1-expected.txt
index f386c4a28e8c6a1ec2c0e56cf30266122e746a29..e7de54e8cf588338abd8a2c58d2b967ad200200b 100644
--- a/ets2panda/test/parser/ets/class_composite_1-expected.txt
+++ b/ets2panda/test/parser/ets/class_composite_1-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt
index a3046e47c1085da7f8c6ef9e954790f89e5ac169..e692c9c1f4d29d67f56f888d64028708e1bb5095 100644
--- a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt
+++ b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 32
+                      "column": 31
                     }
                   }
                 },
@@ -1551,35 +1523,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 39,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 39,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 39,
@@ -1587,7 +1531,7 @@
                     },
                     "end": {
                       "line": 39,
-                      "column": 32
+                      "column": 31
                     }
                   }
                 },
@@ -2229,35 +2173,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 49,
-                          "column": 34
-                        },
-                        "end": {
-                          "line": 49,
-                          "column": 38
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 49,
-                        "column": 34
-                      },
-                      "end": {
-                        "line": 49,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 49,
@@ -2265,7 +2181,7 @@
                     },
                     "end": {
                       "line": 49,
-                      "column": 39
+                      "column": 38
                     }
                   }
                 },
@@ -3496,35 +3412,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 66,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 66,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 66,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 66,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 66,
@@ -3532,7 +3420,7 @@
                     },
                     "end": {
                       "line": 66,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/continue-expected.txt b/ets2panda/test/parser/ets/continue-expected.txt
index cd8cfe6fabf65c4e7e0b788ab216c52b559ed281..072ccfbc335308f2492d2262137d92f3b8b0b47f 100644
--- a/ets2panda/test/parser/ets/continue-expected.txt
+++ b/ets2panda/test/parser/ets/continue-expected.txt
@@ -324,35 +324,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -360,7 +332,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/declare_class-expected.txt b/ets2panda/test/parser/ets/declare_class-expected.txt
index 4e26b0f34509b4b43ddfcbd42916bb3d78572795..315d1e681ab2360bf8d9731de257e2fcf06755ee 100644
--- a/ets2panda/test/parser/ets/declare_class-expected.txt
+++ b/ets2panda/test/parser/ets/declare_class-expected.txt
@@ -399,43 +399,15 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
                       "column": 28
                     },
                     "end": {
-                      "line": 21,
-                      "column": 2
+                      "line": 20,
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt b/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt
index 8fc27406b67b17ec075baded8262001d885f9cda..478bf5c3e0262a9b501b13275a4cba4bfad57967 100644
--- a/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt
+++ b/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt
@@ -215,35 +215,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -251,7 +223,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt b/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt
index beb867b7c5edc03ddd55dd39c38464986da7c261..f39eb8db4d43e8fd101dd9d4920628bc31cddc92 100644
--- a/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt
+++ b/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt
@@ -215,35 +215,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -251,7 +223,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/declare_func-expected.txt b/ets2panda/test/parser/ets/declare_func-expected.txt
index 69f6f0f38f326a2360e5a98fd17bb456ae5d8d60..1f61843eba7c705c3fd87cafa391ee0b6f66b45f 100644
--- a/ets2panda/test/parser/ets/declare_func-expected.txt
+++ b/ets2panda/test/parser/ets/declare_func-expected.txt
@@ -232,35 +232,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 34
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 38
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 34
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -268,7 +240,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 39
+                      "column": 38
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/declare_func_bad-expected.txt b/ets2panda/test/parser/ets/declare_func_bad-expected.txt
index a0e4a781ede408af30bdb078f745dcf4c48e20a6..257a5d68b1f15c5d9099f89fc4c3322a8564db96 100644
--- a/ets2panda/test/parser/ets/declare_func_bad-expected.txt
+++ b/ets2panda/test/parser/ets/declare_func_bad-expected.txt
@@ -232,35 +232,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 34
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 38
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 34
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -268,7 +240,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 40
+                      "column": 38
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/declare_iface-expected.txt b/ets2panda/test/parser/ets/declare_iface-expected.txt
index db0f6ba96b646123fe509aaff92d5d75693bb569..22390e70af1a51d058cb9df04a671a1f7894db73 100644
--- a/ets2panda/test/parser/ets/declare_iface-expected.txt
+++ b/ets2panda/test/parser/ets/declare_iface-expected.txt
@@ -929,35 +929,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -965,7 +937,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 33
+                      "column": 32
                     }
                   }
                 },
@@ -977,7 +949,7 @@
                   },
                   "end": {
                     "line": 19,
-                    "column": 33
+                    "column": 32
                   }
                 }
               },
@@ -988,7 +960,7 @@
                 },
                 "end": {
                   "line": 19,
-                  "column": 33
+                  "column": 32
                 }
               }
             },
diff --git a/ets2panda/test/parser/ets/declare_namespace_2-expected.txt b/ets2panda/test/parser/ets/declare_namespace_2-expected.txt
index ef0198eda6f78a50a67e0f22eb177e38cd1a6393..727d59cfb77ecf8a7d3f26dd4d8c63a7a93ddcf4 100644
--- a/ets2panda/test/parser/ets/declare_namespace_2-expected.txt
+++ b/ets2panda/test/parser/ets/declare_namespace_2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 11
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 15
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 11
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 16
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 16
+                      "column": 15
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/default_parameter1-expected.txt b/ets2panda/test/parser/ets/default_parameter1-expected.txt
index 41c4146c87dd859f8051680729b5de2477869813..d48d8aebb6c35701127ebf4e229667696dda635b 100644
--- a/ets2panda/test/parser/ets/default_parameter1-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter1-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 19
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/default_parameter2-expected.txt b/ets2panda/test/parser/ets/default_parameter2-expected.txt
index 1bc729dc18971726d43817eb01a32178dba82144..a71ba0307b33fbd54bfb964baf324f62683291d1 100644
--- a/ets2panda/test/parser/ets/default_parameter2-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter2-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 19
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/default_parameter4-expected.txt b/ets2panda/test/parser/ets/default_parameter4-expected.txt
index 9ddd3595837e5d7ce3500487c46e198fe039fd33..126cb8f63b343acf615b55337985571bb03c7b0e 100644
--- a/ets2panda/test/parser/ets/default_parameter4-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter4-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 19
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/default_parameter5-expected.txt b/ets2panda/test/parser/ets/default_parameter5-expected.txt
index ab0a5a6760f5398fd88173f216c0a6321beaadcd..d15ef85a7e6c8a00cbcfde63c00181d901f9b885 100644
--- a/ets2panda/test/parser/ets/default_parameter5-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter5-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 19
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt b/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt
index bb716f90ae0c646a570336e75b4bae00abeaf919..2c60213c3b1de2d965b602789f929f7feaeb9082 100644
--- a/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt
+++ b/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt
@@ -1294,35 +1294,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -1330,7 +1302,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 23
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt b/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt
index 63103e5c36e00436f54f6fe15496bc78c7c39ce4..9e690fd0d381baa8f07b6881400a23d5bcfdc8d9 100644
--- a/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt
+++ b/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt
@@ -1221,35 +1221,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 36
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 40
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 36
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 41
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -1257,7 +1229,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 41
+                      "column": 40
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/empty_statement-expected.txt b/ets2panda/test/parser/ets/empty_statement-expected.txt
index 2e225881a50cdbead8412272e1fcb37864c37007..786d08768d0f1f2cd735bee7c4a6c0e18d793624 100644
--- a/ets2panda/test/parser/ets/empty_statement-expected.txt
+++ b/ets2panda/test/parser/ets/empty_statement-expected.txt
@@ -257,35 +257,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -293,7 +265,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
@@ -747,35 +719,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 31,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 31,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 31,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 31,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 31,
@@ -783,7 +727,7 @@
                     },
                     "end": {
                       "line": 31,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum-expected.txt b/ets2panda/test/parser/ets/enum-expected.txt
index edcd158548ed00f63dd34d455018a1c3ffbcb6d7..6d15e922e10123c627317b1bcb45e6cd7c938028 100644
--- a/ets2panda/test/parser/ets/enum-expected.txt
+++ b/ets2panda/test/parser/ets/enum-expected.txt
@@ -922,35 +922,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -958,7 +930,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum10-expected.txt b/ets2panda/test/parser/ets/enum10-expected.txt
index 1f526c797d8bc7785a4937db74d1920ec4dc6df1..fa67a817c64dfaefafe477847da00de4b6e75aac 100644
--- a/ets2panda/test/parser/ets/enum10-expected.txt
+++ b/ets2panda/test/parser/ets/enum10-expected.txt
@@ -235,35 +235,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -271,7 +243,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum11-expected.txt b/ets2panda/test/parser/ets/enum11-expected.txt
index 325edc48c2ae86881647510e6cae905e4e617e96..7e9ff8d5927d93d52466906cbcc6f6fd232156c4 100644
--- a/ets2panda/test/parser/ets/enum11-expected.txt
+++ b/ets2panda/test/parser/ets/enum11-expected.txt
@@ -235,35 +235,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -271,7 +243,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum12-expected.txt b/ets2panda/test/parser/ets/enum12-expected.txt
index a3cb3a471aa35283f1157fee0b5a67d3ce27db16..1a5cbc8ee221416b499c6559cdaaa91f090f0587 100644
--- a/ets2panda/test/parser/ets/enum12-expected.txt
+++ b/ets2panda/test/parser/ets/enum12-expected.txt
@@ -305,35 +305,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -341,7 +313,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
@@ -703,35 +675,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -739,7 +683,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum13-expected.txt b/ets2panda/test/parser/ets/enum13-expected.txt
index e9357392f78077a45f58ac070b9e9e8a04981cb5..440ba7ece942d9fc1d789f1df70f31bcca8a17c5 100644
--- a/ets2panda/test/parser/ets/enum13-expected.txt
+++ b/ets2panda/test/parser/ets/enum13-expected.txt
@@ -305,35 +305,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -341,7 +313,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -762,35 +734,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -798,7 +742,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum14-expected.txt b/ets2panda/test/parser/ets/enum14-expected.txt
index 44f44c38caea3807ebcd57474d1281b0b6f2e824..5be5600c5ac9f51ded11cfefe359f257d780f6e2 100644
--- a/ets2panda/test/parser/ets/enum14-expected.txt
+++ b/ets2panda/test/parser/ets/enum14-expected.txt
@@ -319,35 +319,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -355,7 +327,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum20-expected.txt b/ets2panda/test/parser/ets/enum20-expected.txt
index ddbf6ffb3da603c6a29106d0ab63c8a47d0cbc13..d698d023f3e5736e6a545f9cb6b0c1b0d93e6769 100644
--- a/ets2panda/test/parser/ets/enum20-expected.txt
+++ b/ets2panda/test/parser/ets/enum20-expected.txt
@@ -361,35 +361,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -397,7 +369,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum6-expected.txt b/ets2panda/test/parser/ets/enum6-expected.txt
index b8b1fb3a359381605b4d863ca9895ad7b247d70b..8065c262847afbd1ef9a3353cd14743ff8dd4180 100644
--- a/ets2panda/test/parser/ets/enum6-expected.txt
+++ b/ets2panda/test/parser/ets/enum6-expected.txt
@@ -319,35 +319,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -355,7 +327,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum7-expected.txt b/ets2panda/test/parser/ets/enum7-expected.txt
index 1d1053bc2446774a27ac7b2cd6bf83c42645fa60..e1126efa6a47008704d7951540180f99303f056a 100644
--- a/ets2panda/test/parser/ets/enum7-expected.txt
+++ b/ets2panda/test/parser/ets/enum7-expected.txt
@@ -308,35 +308,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -344,7 +316,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum8-expected.txt b/ets2panda/test/parser/ets/enum8-expected.txt
index 150b136c75eae5fcd727ffee2806b550eff9bb2c..5efdb564d04bbbf02b2ef4e98f7c49943923978b 100644
--- a/ets2panda/test/parser/ets/enum8-expected.txt
+++ b/ets2panda/test/parser/ets/enum8-expected.txt
@@ -308,35 +308,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -344,7 +316,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/enum9-expected.txt b/ets2panda/test/parser/ets/enum9-expected.txt
index 30778307262e9d70dd1d927c87f7642a7048b5a5..84e7b2d9062b8598898cea6576633e20bd66d660 100644
--- a/ets2panda/test/parser/ets/enum9-expected.txt
+++ b/ets2panda/test/parser/ets/enum9-expected.txt
@@ -235,35 +235,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -271,7 +243,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/exports-expected.txt b/ets2panda/test/parser/ets/exports-expected.txt
index aab03ca6223b18134f4b881ca75b3b54274a573f..1d646588e566449e85a777418a701072bda70336 100644
--- a/ets2panda/test/parser/ets/exports-expected.txt
+++ b/ets2panda/test/parser/ets/exports-expected.txt
@@ -540,35 +540,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -576,7 +548,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/for_of-expected.txt b/ets2panda/test/parser/ets/for_of-expected.txt
index d3446be05acb4a707042ce62be9e66b71e03153c..a7ec20b3c19c74ac864cf63aa1f49e9185dfba9a 100644
--- a/ets2panda/test/parser/ets/for_of-expected.txt
+++ b/ets2panda/test/parser/ets/for_of-expected.txt
@@ -324,35 +324,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -360,7 +332,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/for_of_02-expected.txt b/ets2panda/test/parser/ets/for_of_02-expected.txt
index f7ae611379b140d2abf221271420444eec740cd0..47593ed0606cbdd3a1084ec385f9f9183816f3e2 100644
--- a/ets2panda/test/parser/ets/for_of_02-expected.txt
+++ b/ets2panda/test/parser/ets/for_of_02-expected.txt
@@ -588,35 +588,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -624,7 +596,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/for_with_break-expected.txt b/ets2panda/test/parser/ets/for_with_break-expected.txt
index ec654926a4c6c689dcc4968235e4a51608ba437c..14344437546ed85b3248cb222e78716e72374bf4 100644
--- a/ets2panda/test/parser/ets/for_with_break-expected.txt
+++ b/ets2panda/test/parser/ets/for_with_break-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt b/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt
index 58d47fb3f6cf307a9ba2790a6cf7244b68c40207..2f1584bc251d18a6ca4942b28a2846f08bc0ed5f 100644
--- a/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt
+++ b/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -548,35 +520,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 75
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 79
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 75
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 88
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -584,7 +528,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 88
+                      "column": 79
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt
index 371c602d96c060369d10121dc6937c8de64f65a2..9630d641f0c5b3a516d1d4b81c09b4fe9f69a3cd 100644
--- a/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt
+++ b/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/generic_error-expected.txt b/ets2panda/test/parser/ets/generic_error-expected.txt
index 11e1c94b0ed0fde5ea2e79046eb404048864bbb0..b5b8f7d3893aeacc471971ecd4f9d42332bea541 100644
--- a/ets2panda/test/parser/ets/generic_error-expected.txt
+++ b/ets2panda/test/parser/ets/generic_error-expected.txt
@@ -605,35 +605,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -641,7 +613,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/generic_resolve-expected.txt b/ets2panda/test/parser/ets/generic_resolve-expected.txt
index ee62b20b1c7e2fe0dba892af9d9d9c6af9d21ecf..11a66547e816cf7369217d94a63ed38c36c196b4 100644
--- a/ets2panda/test/parser/ets/generic_resolve-expected.txt
+++ b/ets2panda/test/parser/ets/generic_resolve-expected.txt
@@ -598,35 +598,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 22,
-                                        "column": 23
-                                      },
-                                      "end": {
-                                        "line": 22,
-                                        "column": 27
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 23
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 29
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 22,
@@ -634,7 +606,7 @@
                                   },
                                   "end": {
                                     "line": 22,
-                                    "column": 29
+                                    "column": 27
                                   }
                                 }
                               },
@@ -645,7 +617,7 @@
                                 },
                                 "end": {
                                   "line": 22,
-                                  "column": 29
+                                  "column": 27
                                 }
                               }
                             },
@@ -671,35 +643,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 22,
-                                        "column": 34
-                                      },
-                                      "end": {
-                                        "line": 22,
-                                        "column": 38
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 22,
-                                      "column": 34
-                                    },
-                                    "end": {
-                                      "line": 22,
-                                      "column": 41
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 22,
@@ -707,7 +651,7 @@
                                   },
                                   "end": {
                                     "line": 22,
-                                    "column": 41
+                                    "column": 38
                                   }
                                 }
                               },
@@ -1167,35 +1111,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 39
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 43
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 39
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 44
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -1203,7 +1119,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 44
+                      "column": 43
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/generics_1-expected.txt b/ets2panda/test/parser/ets/generics_1-expected.txt
index d8e381e5d79357471ad7d40e3f3153c46c732594..66c0a6a5979c3c4fdac4d618d62ba34211e6c28b 100644
--- a/ets2panda/test/parser/ets/generics_1-expected.txt
+++ b/ets2panda/test/parser/ets/generics_1-expected.txt
@@ -932,35 +932,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -968,7 +940,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt
index 5d2baa5275ba064b0dff77cbe23ed32d5a5de3df..4e65fd62c650d77caf8796a89471f03bc435c327 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt
@@ -536,35 +536,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -572,7 +544,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt
index c01abfe35c951526eb766700c0f41f25a34061eb..af0880a85239544124e42521009efdc6decc54e9 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt
@@ -122,35 +122,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -158,7 +130,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 23
+                      "column": 22
                     }
                   }
                 },
@@ -170,7 +142,7 @@
                   },
                   "end": {
                     "line": 18,
-                    "column": 23
+                    "column": 22
                   }
                 }
               },
@@ -181,7 +153,7 @@
                 },
                 "end": {
                   "line": 18,
-                  "column": 23
+                  "column": 22
                 }
               }
             },
diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt
index fd54bd69e73bc35d596b15baeb8d66b7b262de96..85dde51e85503e4edcfa0ef492d9fd45fc9e3042 100644
--- a/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt
+++ b/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt
@@ -122,35 +122,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -158,7 +130,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 23
                     }
                   }
                 },
@@ -170,7 +142,7 @@
                   },
                   "end": {
                     "line": 18,
-                    "column": 24
+                    "column": 23
                   }
                 }
               },
@@ -181,7 +153,7 @@
                 },
                 "end": {
                   "line": 18,
-                  "column": 24
+                  "column": 23
                 }
               }
             },
@@ -314,35 +286,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -350,7 +294,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 23
                     }
                   }
                 },
@@ -362,7 +306,7 @@
                   },
                   "end": {
                     "line": 19,
-                    "column": 24
+                    "column": 23
                   }
                 }
               },
@@ -373,7 +317,7 @@
                 },
                 "end": {
                   "line": 19,
-                  "column": 24
+                  "column": 23
                 }
               }
             },
diff --git a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt
index 3412eacfea5a68acaf1a45299365245c543af3f4..927d1eea457dc6cae2152fd8d11d83ff3c5a624a 100644
--- a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt
+++ b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt
@@ -1067,35 +1067,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 35,
-                              "column": 31
-                            },
-                            "end": {
-                              "line": 35,
-                              "column": 35
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 35,
-                            "column": 31
-                          },
-                          "end": {
-                            "line": 35,
-                            "column": 37
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 35,
@@ -1103,7 +1075,7 @@
                         },
                         "end": {
                           "line": 35,
-                          "column": 37
+                          "column": 35
                         }
                       }
                     },
@@ -1343,35 +1315,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 39,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 39,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 39,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 39,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 39,
@@ -1379,7 +1323,7 @@
                     },
                     "end": {
                       "line": 39,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt b/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt
index ed873fe6929caabb985252186532009293bcd939..0126b2316765c0168bbafe459226816cd054458c 100644
--- a/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt
+++ b/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt
@@ -360,35 +360,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 24,
-                              "column": 29
-                            },
-                            "end": {
-                              "line": 24,
-                              "column": 33
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 24,
-                            "column": 29
-                          },
-                          "end": {
-                            "line": 24,
-                            "column": 35
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 24,
@@ -396,7 +368,7 @@
                         },
                         "end": {
                           "line": 24,
-                          "column": 35
+                          "column": 33
                         }
                       }
                     },
@@ -911,35 +883,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 33,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 33,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 33,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 33,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 33,
@@ -947,7 +891,7 @@
                     },
                     "end": {
                       "line": 33,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/global_const_vars3-expected.txt b/ets2panda/test/parser/ets/global_const_vars3-expected.txt
index e2c12eaa49798fdd8480024812da446e5f294a71..04e9ad0cdb7ab9fb9c4bc762124e9ac0b03443a0 100644
--- a/ets2panda/test/parser/ets/global_const_vars3-expected.txt
+++ b/ets2panda/test/parser/ets/global_const_vars3-expected.txt
@@ -365,35 +365,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -401,7 +373,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/global_const_vars4-expected.txt b/ets2panda/test/parser/ets/global_const_vars4-expected.txt
index 8d67d403e87a8e200ea9088362ca8a568d1e9889..effa949d28357cc36a655306c0c70371a274f42d 100644
--- a/ets2panda/test/parser/ets/global_const_vars4-expected.txt
+++ b/ets2panda/test/parser/ets/global_const_vars4-expected.txt
@@ -366,35 +366,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -402,7 +374,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
@@ -627,35 +599,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -663,7 +607,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/if-expected.txt b/ets2panda/test/parser/ets/if-expected.txt
index affe2d1603bb043d31ba5bea7761f384ffe9c64d..fcf38d2ba650bb2e6fa34d125c77546c9eef4983 100644
--- a/ets2panda/test/parser/ets/if-expected.txt
+++ b/ets2panda/test/parser/ets/if-expected.txt
@@ -208,35 +208,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -244,7 +216,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt
index 26d1fd8247e7ee041b69f60a4973bf244f6bd262..c71aace2c723a6705c2ecfd89601cea610265d55 100644
--- a/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt
index 8252c9d7ce90285eb3e27cf2a3dd5398a03b1bf8..5c8e3e5254ec23d328e1a51bd211b76cecc0f772 100644
--- a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt
index 6f65df047697c0e17df741ac22d048b7e86750ad..c4ed835aa2f5385dd512b23bbc06a45cbf1fa852 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt
@@ -737,35 +737,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -773,7 +745,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
@@ -872,35 +844,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 26,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 26,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 26,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 26,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 26,
@@ -908,7 +852,7 @@
                     },
                     "end": {
                       "line": 26,
-                      "column": 29
+                      "column": 28
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt
index 0c9678eb433ace3fb59fff002d31014ebb90df93..5de026fa9a52c06b6a4cf6133969cc1f39864215 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt
index b93dcf3bac849942c4f57a412c0f257fb61c8ec5..ebe97c1959d1a3fa770dabb9d05543e32bbd1854 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt
index 87472d20e31031ce6e5589922d7ec5df5b096af2..547431415f0408aa3bf8799b40e6e51153b0ae8d 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt
index 0f2f2abf8901b9af76709912111ae7b4865e2f06..d1c93f18547474e1f24f436b2fd2425d865fe26b 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt
index 8c0b40cfd6a06a6f6864768accc49b604ae40119..c1757bd21cfbfe728d17d27f47adbca49a9d08ba 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt
@@ -291,35 +291,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -327,7 +299,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt
index d5602c785eb59822752afd9e1235f516836dd714..cfe800f574da691af6eadd9631d6c9428420bee9 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt
@@ -363,35 +363,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -399,7 +371,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt
index 4f64d5816351e31dcff6b4b6732a259ab308f259..f4d8f9abdd37015c285d44c39a069a9494915042 100644
--- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt
@@ -363,35 +363,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -399,7 +371,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt
index ab855e1e6c17a1138ce15e697ba0af1bf186b408..71291eb448c0cb7fe62d7f8d2f3daa0a1ad7229a 100644
--- a/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt
index 29061158abb178cb09a3751388bbc8f69d92d7d5..d2e2cc8352f817525a69772a549fb8da6ff434aa 100644
--- a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt
@@ -219,35 +219,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -255,7 +227,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt
index 12beab65ee730cdd39e70c078c58322cfe09ef9f..d7c4a9587b5198d17df6218d06622fd256d0ccde 100644
--- a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt
@@ -234,35 +234,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -270,7 +242,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt
index 400aae202adc3309f89d725301ce84d980b31999..cf617e0d5bb6dfacaa3f4d66f0b6879757993fc6 100644
--- a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt
@@ -234,35 +234,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -270,7 +242,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt
index 7b52eccf5393a22ad93c50e82466192f7ea720a4..4407e0da8df9c9cfa3a5a53df797af7c59616fa9 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 48
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 52
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 48
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 54
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 54
+                      "column": 52
                     }
                   }
                 },
@@ -297,35 +269,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 43
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 47
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 43
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 49
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -333,7 +277,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 49
+                      "column": 47
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt
index de79dcf4315ce5630f0c87f36df420b1458ab95f..1cb362a46f4d7b024320101f7b96bce5e29d516e 100644
--- a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt
index db8f03c2be7f5600f3ca8df48f3a191819b8a5af..b6f39a4560038542333ca7d6202aa332d53ee263 100644
--- a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt
@@ -597,35 +597,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -633,7 +605,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt
index 78b1a6b2bbd6691406f23800e20c09cbf2293a27..2035da6e46fe85114297d4a1b4a296ee51088d2d 100644
--- a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt
+++ b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt
@@ -500,35 +500,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -536,7 +508,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/inheritance2-expected.txt b/ets2panda/test/parser/ets/inheritance2-expected.txt
index b6c70a83deff528dc53c38b4451507499c9cd6ff..36af7ac4f93e2d2c311f5bd3168a1239e18fbccf 100644
--- a/ets2panda/test/parser/ets/inheritance2-expected.txt
+++ b/ets2panda/test/parser/ets/inheritance2-expected.txt
@@ -830,35 +830,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -866,7 +838,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/interface_static_function_1-expected.txt b/ets2panda/test/parser/ets/interface_static_function_1-expected.txt
index ed88c432e05b8047bc1e4e927250948a9ebcf1d2..6d19156003750bc1bf8f8765f4d6df5e20aa19e7 100644
--- a/ets2panda/test/parser/ets/interface_static_function_1-expected.txt
+++ b/ets2panda/test/parser/ets/interface_static_function_1-expected.txt
@@ -805,35 +805,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -841,7 +813,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/interface_static_function_2-expected.txt b/ets2panda/test/parser/ets/interface_static_function_2-expected.txt
index aaf46ac04d8b3e48e952cc1d62de06e71847ea22..e344174ceb1b2583d4935a45a5f8a0e5cbc5dcc6 100644
--- a/ets2panda/test/parser/ets/interface_static_function_2-expected.txt
+++ b/ets2panda/test/parser/ets/interface_static_function_2-expected.txt
@@ -805,35 +805,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -841,7 +813,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/interfaces-expected.txt b/ets2panda/test/parser/ets/interfaces-expected.txt
index 5867d9032de77928010dd623187fef0f1546949f..4c33267a1118852fa60f4ec4af3666f3e688a0a2 100644
--- a/ets2panda/test/parser/ets/interfaces-expected.txt
+++ b/ets2panda/test/parser/ets/interfaces-expected.txt
@@ -934,35 +934,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -970,7 +942,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -1144,35 +1116,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -1180,7 +1124,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -1280,35 +1224,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -1316,7 +1232,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/internalParsing-expected.txt b/ets2panda/test/parser/ets/internalParsing-expected.txt
index a2fe1faccdd55da48ffec893504596803c38dc1f..91c3639a747d1f9947fa1ae73482f7ec0e65f82e 100644
--- a/ets2panda/test/parser/ets/internalParsing-expected.txt
+++ b/ets2panda/test/parser/ets/internalParsing-expected.txt
@@ -514,35 +514,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -550,7 +522,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -787,35 +759,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -823,7 +767,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt
index 9c8de543ac0094195f72e82a9368f8251bfb76a4..ceeee9e6f7b50a1b5dec459b9d7ae6a4a963d23a 100644
--- a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt
+++ b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt
@@ -723,35 +723,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -759,7 +731,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -996,35 +968,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -1032,7 +976,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt
index bac5b0dde578c83af3bd1802ea94dd496e2883dd..07b3af4cc8460a43db1acd34ac880053f46e7078 100644
--- a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 34
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 38
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 34
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 40
+                      "column": 38
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/labeledForStatement-expected.txt b/ets2panda/test/parser/ets/labeledForStatement-expected.txt
index cc597d92ce59ccab93c30f2b936fbe62b0d0aeb2..49245fba59479c5e321e96db1ba9eb90142e6c1f 100644
--- a/ets2panda/test/parser/ets/labeledForStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledForStatement-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 30
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 34
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 36
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 36
+                      "column": 34
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt
index a8ffaf63a76f86d1c5b4fb27cfd3a0f933a1f312..3dd740a25fe4066050ba21e283d8aab08aaef598 100644
--- a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -956,35 +928,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 36,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 36,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 36,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 36,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 36,
@@ -992,7 +936,7 @@
                     },
                     "end": {
                       "line": 36,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt
index c7ac60a0eaab52b232583f06722f3b5842807be9..ed679bcd287265b378e8f51483c69e05498da41a 100644
--- a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt
+++ b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 32
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 36
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 32
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 38
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 38
+                      "column": 36
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambda-expected.txt b/ets2panda/test/parser/ets/lambda-expected.txt
index 7110e936627bc233db35a567b6dc497f43ad6b81..9bae6d8f2a934eb00d9ff9555aad724be4151afe 100644
--- a/ets2panda/test/parser/ets/lambda-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-expected.txt
@@ -240,35 +240,7 @@
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 41
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 45
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 41
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 46
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -276,7 +248,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 46
+                              "column": 45
                             }
                           }
                         },
@@ -287,7 +259,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 46
+                            "column": 45
                           }
                         }
                       },
@@ -299,7 +271,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 46
+                          "column": 45
                         }
                       }
                     },
@@ -310,41 +282,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 46
+                        "column": 45
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 48
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 52
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 48
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 54
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -352,7 +296,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 54
+                      "column": 52
                     }
                   }
                 },
@@ -510,35 +454,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -546,7 +462,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -653,35 +569,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 21,
-                                        "column": 24
-                                      },
-                                      "end": {
-                                        "line": 21,
-                                        "column": 28
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 21,
-                                      "column": 24
-                                    },
-                                    "end": {
-                                      "line": 21,
-                                      "column": 31
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 21,
@@ -689,7 +577,7 @@
                                   },
                                   "end": {
                                     "line": 21,
-                                    "column": 31
+                                    "column": 28
                                   }
                                 }
                               },
diff --git a/ets2panda/test/parser/ets/lambda-lambda-expected.txt b/ets2panda/test/parser/ets/lambda-lambda-expected.txt
index a6897819c13a21d44cd3a0c8abf0c5071f17841f..715e50ec4be4c7dba93020dcad3e6de6bbe2b919 100644
--- a/ets2panda/test/parser/ets/lambda-lambda-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-lambda-expected.txt
@@ -220,35 +220,7 @@
                                   }
                                 ],
                                 "returnType": {
-                                  "type": "ETSTypeReference",
-                                  "part": {
-                                    "type": "ETSTypeReferencePart",
-                                    "name": {
-                                      "type": "Identifier",
-                                      "name": "void",
-                                      "decorators": [],
-                                      "loc": {
-                                        "start": {
-                                          "line": 16,
-                                          "column": 48
-                                        },
-                                        "end": {
-                                          "line": 16,
-                                          "column": 52
-                                        }
-                                      }
-                                    },
-                                    "loc": {
-                                      "start": {
-                                        "line": 16,
-                                        "column": 48
-                                      },
-                                      "end": {
-                                        "line": 16,
-                                        "column": 53
-                                      }
-                                    }
-                                  },
+                                  "type": "ETSPrimitiveType",
                                   "loc": {
                                     "start": {
                                       "line": 16,
@@ -256,7 +228,7 @@
                                     },
                                     "end": {
                                       "line": 16,
-                                      "column": 53
+                                      "column": 52
                                     }
                                   }
                                 },
@@ -267,7 +239,7 @@
                                   },
                                   "end": {
                                     "line": 16,
-                                    "column": 53
+                                    "column": 52
                                   }
                                 }
                               },
@@ -279,7 +251,7 @@
                                 },
                                 "end": {
                                   "line": 16,
-                                  "column": 53
+                                  "column": 52
                                 }
                               }
                             },
@@ -290,41 +262,13 @@
                               },
                               "end": {
                                 "line": 16,
-                                "column": 53
+                                "column": 52
                               }
                             }
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 57
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 61
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 57
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 62
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -332,7 +276,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 62
+                              "column": 61
                             }
                           }
                         },
@@ -343,7 +287,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 62
+                            "column": 61
                           }
                         }
                       },
@@ -355,7 +299,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 62
+                          "column": 61
                         }
                       }
                     },
@@ -366,41 +310,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 62
+                        "column": 61
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 64
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 68
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 64
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 70
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -408,7 +324,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 70
+                      "column": 68
                     }
                   }
                 },
@@ -507,35 +423,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -543,7 +431,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -630,35 +518,7 @@
                                         }
                                       ],
                                       "returnType": {
-                                        "type": "ETSTypeReference",
-                                        "part": {
-                                          "type": "ETSTypeReferencePart",
-                                          "name": {
-                                            "type": "Identifier",
-                                            "name": "void",
-                                            "decorators": [],
-                                            "loc": {
-                                              "start": {
-                                                "line": 20,
-                                                "column": 33
-                                              },
-                                              "end": {
-                                                "line": 20,
-                                                "column": 37
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 20,
-                                              "column": 33
-                                            },
-                                            "end": {
-                                              "line": 20,
-                                              "column": 38
-                                            }
-                                          }
-                                        },
+                                        "type": "ETSPrimitiveType",
                                         "loc": {
                                           "start": {
                                             "line": 20,
@@ -666,7 +526,7 @@
                                           },
                                           "end": {
                                             "line": 20,
-                                            "column": 38
+                                            "column": 37
                                           }
                                         }
                                       },
@@ -677,7 +537,7 @@
                                         },
                                         "end": {
                                           "line": 20,
-                                          "column": 38
+                                          "column": 37
                                         }
                                       }
                                     },
@@ -689,7 +549,7 @@
                                       },
                                       "end": {
                                         "line": 20,
-                                        "column": 38
+                                        "column": 37
                                       }
                                     }
                                   },
@@ -700,41 +560,13 @@
                                     },
                                     "end": {
                                       "line": 20,
-                                      "column": 38
+                                      "column": 37
                                     }
                                   }
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 20,
-                                        "column": 40
-                                      },
-                                      "end": {
-                                        "line": 20,
-                                        "column": 44
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 20,
-                                      "column": 40
-                                    },
-                                    "end": {
-                                      "line": 20,
-                                      "column": 47
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 20,
@@ -742,7 +574,7 @@
                                   },
                                   "end": {
                                     "line": 20,
-                                    "column": 47
+                                    "column": 44
                                   }
                                 }
                               },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt
index 3ed65879e2856432a15a0f487e1a3748c4738caf..a9570ccb8c6dba424fb7717ea366f609e89b600c 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt
@@ -64,35 +64,7 @@
           }
         ],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 27
-                },
-                "end": {
-                  "line": 16,
-                  "column": 31
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 27
-              },
-              "end": {
-                "line": 16,
-                "column": 32
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
@@ -100,7 +72,7 @@
             },
             "end": {
               "line": 16,
-              "column": 32
+              "column": 31
             }
           }
         },
@@ -111,7 +83,7 @@
           },
           "end": {
             "line": 16,
-            "column": 32
+            "column": 31
           }
         }
       },
@@ -426,35 +398,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 34
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 38
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 34
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 40
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -462,7 +406,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 40
+                      "column": 38
                     }
                   }
                 },
@@ -561,35 +505,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -597,7 +513,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -663,35 +579,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 23,
-                                        "column": 14
-                                      },
-                                      "end": {
-                                        "line": 23,
-                                        "column": 18
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 23,
-                                      "column": 14
-                                    },
-                                    "end": {
-                                      "line": 23,
-                                      "column": 21
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 23,
@@ -699,7 +587,7 @@
                                   },
                                   "end": {
                                     "line": 23,
-                                    "column": 21
+                                    "column": 18
                                   }
                                 }
                               },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt
index 971a987aff499edf854ca45082bdfae31d0841ab..d6834b671d553377b8b665616dd332f544b35cc9 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt
@@ -329,35 +329,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 57
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 61
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 57
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 63
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -365,7 +337,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 63
+                      "column": 61
                     }
                   }
                 },
@@ -581,35 +553,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -617,7 +561,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt
index ca93a3e8cfa83911d4960b74c177e9393c9760e2..32e3fc57cd7aeeca71ba622fab7dbda421c20e91 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 44
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 48
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 44
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 49
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 49
+                              "column": 48
                             }
                           }
                         },
@@ -217,7 +189,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 49
+                            "column": 48
                           }
                         }
                       },
@@ -229,7 +201,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 49
+                          "column": 48
                         }
                       }
                     },
@@ -240,41 +212,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 49
+                        "column": 48
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 51
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 55
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 51
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 57
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -282,7 +226,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 57
+                      "column": 55
                     }
                   }
                 },
@@ -481,35 +425,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 49
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 53
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 49
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 55
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -517,7 +433,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 55
+                      "column": 53
                     }
                   }
                 },
@@ -871,35 +787,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 75
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 79
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 75
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 81
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -907,7 +795,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 81
+                      "column": 79
                     }
                   }
                 },
@@ -1123,35 +1011,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -1159,7 +1019,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -1196,35 +1056,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 29,
-                                        "column": 27
-                                      },
-                                      "end": {
-                                        "line": 29,
-                                        "column": 31
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 29,
-                                      "column": 27
-                                    },
-                                    "end": {
-                                      "line": 29,
-                                      "column": 34
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 29,
@@ -1232,7 +1064,7 @@
                                   },
                                   "end": {
                                     "line": 29,
-                                    "column": 34
+                                    "column": 31
                                   }
                                 }
                               },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt
index b814441ff1eb97ccfdb53687762b638838cc1e19..86779603cad8bfc6a76b13ab225d1f91bc6d9da8 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt
@@ -212,35 +212,7 @@
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 40
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 44
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 40
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 45
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -248,7 +220,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 45
+                              "column": 44
                             }
                           }
                         },
@@ -259,7 +231,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 45
+                            "column": 44
                           }
                         }
                       },
@@ -271,7 +243,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 45
+                          "column": 44
                         }
                       }
                     },
@@ -282,41 +254,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 45
+                        "column": 44
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 47
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 51
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 47
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 53
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -324,7 +268,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 53
+                      "column": 51
                     }
                   }
                 },
@@ -461,35 +405,7 @@
                               }
                             ],
                             "returnType": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "void",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 36
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 40
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 36
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 41
-                                  }
-                                }
-                              },
+                              "type": "ETSPrimitiveType",
                               "loc": {
                                 "start": {
                                   "line": 19,
@@ -497,7 +413,7 @@
                                 },
                                 "end": {
                                   "line": 19,
-                                  "column": 41
+                                  "column": 40
                                 }
                               }
                             },
@@ -508,7 +424,7 @@
                               },
                               "end": {
                                 "line": 19,
-                                "column": 41
+                                "column": 40
                               }
                             }
                           },
@@ -520,7 +436,7 @@
                             },
                             "end": {
                               "line": 19,
-                              "column": 41
+                              "column": 40
                             }
                           }
                         },
@@ -531,41 +447,13 @@
                           },
                           "end": {
                             "line": 19,
-                            "column": 41
+                            "column": 40
                           }
                         }
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 43
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 47
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 43
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 49
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 19,
@@ -573,7 +461,7 @@
                         },
                         "end": {
                           "line": 19,
-                          "column": 49
+                          "column": 47
                         }
                       }
                     },
@@ -685,35 +573,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -721,7 +581,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt
index 84f195713e2fc4f07d13154c51432f12a654e55d..5a318e08709c81460ad4c7ce0318e7c6115e0f23 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt
@@ -301,35 +301,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 50
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 54
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 50
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 56
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -337,7 +309,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 56
+                      "column": 54
                     }
                   }
                 },
@@ -553,35 +525,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -589,7 +533,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt
index ae30c4f989eed98c45d5048b566e7af9ae9d7e4a..5fb584ec375d209391f7f8584f3fc95b183b261b 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt
@@ -329,35 +329,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 57
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 61
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 57
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 63
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -365,7 +337,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 63
+                      "column": 61
                     }
                   }
                 },
@@ -581,35 +553,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -617,7 +561,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt
index 5c3f1759fa7bb05c48bd7259abfb0a31864cbf07..e422dc6eb51ecadad3deb8665fab893510196c72 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt
@@ -329,35 +329,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 57
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 61
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 57
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 63
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -365,7 +337,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 63
+                      "column": 61
                     }
                   }
                 },
@@ -736,35 +708,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 20,
-                              "column": 60
-                            },
-                            "end": {
-                              "line": 20,
-                              "column": 64
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 20,
-                            "column": 60
-                          },
-                          "end": {
-                            "line": 20,
-                            "column": 66
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 20,
@@ -772,7 +716,7 @@
                         },
                         "end": {
                           "line": 20,
-                          "column": 66
+                          "column": 64
                         }
                       }
                     },
@@ -1001,35 +945,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -1037,7 +953,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt
index d87a2cfdb96cab3c4aea5decfe5d80f0fcf32ea7..1a2cf3953243a16375e2f1f8a65356fa7a1b6848 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 30
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 34
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 30
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 35
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 35
+                              "column": 34
                             }
                           }
                         },
@@ -217,7 +189,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 35
+                            "column": 34
                           }
                         }
                       },
@@ -229,7 +201,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 35
+                          "column": 34
                         }
                       }
                     },
@@ -240,7 +212,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 35
+                        "column": 34
                       }
                     }
                   },
@@ -287,35 +259,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 45
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 49
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 45
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 51
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -323,7 +267,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 51
+                      "column": 49
                     }
                   }
                 },
@@ -549,35 +493,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 58
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 62
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 58
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 64
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 19,
@@ -585,7 +501,7 @@
                         },
                         "end": {
                           "line": 19,
-                          "column": 64
+                          "column": 62
                         }
                       }
                     },
@@ -697,35 +613,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -733,7 +621,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt
index c6cbd4d02bf72458f07cff22048a43fca9aeb80c..a3d4d031020edef5dde104a00d87764dcbd9195c 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt
@@ -118,35 +118,7 @@
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 31
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 35
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 31
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 36
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -154,7 +126,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 36
+                              "column": 35
                             }
                           }
                         },
@@ -165,7 +137,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 36
+                            "column": 35
                           }
                         }
                       },
@@ -177,7 +149,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 36
+                          "column": 35
                         }
                       }
                     },
@@ -188,41 +160,13 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 36
+                        "column": 35
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 38
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 42
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 38
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 44
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -230,7 +174,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 44
+                      "column": 42
                     }
                   }
                 },
@@ -556,35 +500,7 @@
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 22,
-                                  "column": 34
-                                },
-                                "end": {
-                                  "line": 22,
-                                  "column": 38
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 22,
-                                "column": 34
-                              },
-                              "end": {
-                                "line": 22,
-                                "column": 39
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 22,
@@ -592,7 +508,7 @@
                             },
                             "end": {
                               "line": 22,
-                              "column": 39
+                              "column": 38
                             }
                           }
                         },
@@ -603,7 +519,7 @@
                           },
                           "end": {
                             "line": 22,
-                            "column": 39
+                            "column": 38
                           }
                         }
                       },
@@ -615,7 +531,7 @@
                         },
                         "end": {
                           "line": 22,
-                          "column": 39
+                          "column": 38
                         }
                       }
                     },
@@ -626,41 +542,13 @@
                       },
                       "end": {
                         "line": 22,
-                        "column": 39
+                        "column": 38
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 41
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 45
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 41
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 47
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -668,7 +556,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 47
+                      "column": 45
                     }
                   }
                 },
@@ -767,35 +655,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 19
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -803,7 +663,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 19
+                      "column": 17
                     }
                   }
                 },
@@ -897,35 +757,7 @@
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 26,
-                                        "column": 23
-                                      },
-                                      "end": {
-                                        "line": 26,
-                                        "column": 27
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 26,
-                                      "column": 23
-                                    },
-                                    "end": {
-                                      "line": 26,
-                                      "column": 30
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 26,
@@ -933,7 +765,7 @@
                                   },
                                   "end": {
                                     "line": 26,
-                                    "column": 30
+                                    "column": 27
                                   }
                                 }
                               },
diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt
index f703a32a678b140754f4b54842c9203f16ea4e39..45b5ee1b40adb0cad9ff76831e7d66540a7b880f 100644
--- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt
+++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt
@@ -232,35 +232,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -268,7 +240,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -363,35 +335,7 @@
                             "type": "ETSFunctionType",
                             "params": [],
                             "returnType": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "void",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 30
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 34
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 19,
-                                    "column": 30
-                                  },
-                                  "end": {
-                                    "line": 19,
-                                    "column": 35
-                                  }
-                                }
-                              },
+                              "type": "ETSPrimitiveType",
                               "loc": {
                                 "start": {
                                   "line": 19,
@@ -399,7 +343,7 @@
                                 },
                                 "end": {
                                   "line": 19,
-                                  "column": 35
+                                  "column": 34
                                 }
                               }
                             },
@@ -410,7 +354,7 @@
                               },
                               "end": {
                                 "line": 19,
-                                "column": 35
+                                "column": 34
                               }
                             }
                           },
@@ -422,7 +366,7 @@
                             },
                             "end": {
                               "line": 19,
-                              "column": 35
+                              "column": 34
                             }
                           }
                         },
@@ -433,41 +377,13 @@
                           },
                           "end": {
                             "line": 19,
-                            "column": 35
+                            "column": 34
                           }
                         }
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 19,
-                              "column": 37
-                            },
-                            "end": {
-                              "line": 19,
-                              "column": 41
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 19,
-                            "column": 37
-                          },
-                          "end": {
-                            "line": 19,
-                            "column": 43
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 19,
@@ -475,7 +391,7 @@
                         },
                         "end": {
                           "line": 19,
-                          "column": 43
+                          "column": 41
                         }
                       }
                     },
@@ -785,35 +701,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 23,
-                              "column": 57
-                            },
-                            "end": {
-                              "line": 23,
-                              "column": 61
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 23,
-                            "column": 57
-                          },
-                          "end": {
-                            "line": 23,
-                            "column": 63
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 23,
@@ -821,7 +709,7 @@
                         },
                         "end": {
                           "line": 23,
-                          "column": 63
+                          "column": 61
                         }
                       }
                     },
@@ -1050,35 +938,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -1086,7 +946,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt
index 22c782deecc9bd7325fb725e882075f42a897525..da25446262f055b3e0a206f2ae8ff7a1c297f6c0 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt
index abbbb1b23283cc50d15d29b65fa8ee5e0a7eb5fa..166cc49993334a4bfbee15bec26096276e818b45 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -297,35 +269,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -333,7 +277,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -352,35 +296,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 22
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 26
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 22
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 28
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 19,
@@ -388,7 +304,7 @@
                                   },
                                   "end": {
                                     "line": 19,
-                                    "column": 28
+                                    "column": 26
                                   }
                                 }
                               },
@@ -399,7 +315,7 @@
                                 },
                                 "end": {
                                   "line": 19,
-                                  "column": 28
+                                  "column": 26
                                 }
                               }
                             },
@@ -425,35 +341,7 @@
                               "expression": true,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 33
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 37
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 33
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 40
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 19,
@@ -461,7 +349,7 @@
                                   },
                                   "end": {
                                     "line": 19,
-                                    "column": 40
+                                    "column": 37
                                   }
                                 }
                               },
@@ -469,8 +357,8 @@
                                 "type": "BlockStatement",
                                 "statements": [
                                   {
-                                    "type": "ReturnStatement",
-                                    "argument": {
+                                    "type": "ExpressionStatement",
+                                    "expression": {
                                       "type": "CallExpression",
                                       "callee": {
                                         "type": "Identifier",
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt
index d1c490b6118a4ca8cbe50ac705bd20874a91b940..5f4bbd9763383ad0c73ba5a2c9904bd89e69c0c3 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -217,35 +189,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 17,
-                                        "column": 18
-                                      },
-                                      "end": {
-                                        "line": 17,
-                                        "column": 22
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 17,
-                                      "column": 18
-                                    },
-                                    "end": {
-                                      "line": 17,
-                                      "column": 24
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 17,
@@ -253,7 +197,7 @@
                                   },
                                   "end": {
                                     "line": 17,
-                                    "column": 24
+                                    "column": 22
                                   }
                                 }
                               },
@@ -264,7 +208,7 @@
                                 },
                                 "end": {
                                   "line": 17,
-                                  "column": 24
+                                  "column": 22
                                 }
                               }
                             },
@@ -290,35 +234,7 @@
                               "expression": true,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 17,
-                                        "column": 29
-                                      },
-                                      "end": {
-                                        "line": 17,
-                                        "column": 33
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 17,
-                                      "column": 29
-                                    },
-                                    "end": {
-                                      "line": 17,
-                                      "column": 36
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 17,
@@ -326,7 +242,7 @@
                                   },
                                   "end": {
                                     "line": 17,
-                                    "column": 36
+                                    "column": 33
                                   }
                                 }
                               },
@@ -334,8 +250,8 @@
                                 "type": "BlockStatement",
                                 "statements": [
                                   {
-                                    "type": "ReturnStatement",
-                                    "argument": {
+                                    "type": "ExpressionStatement",
+                                    "expression": {
                                       "type": "CallExpression",
                                       "callee": {
                                         "type": "MemberExpression",
diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt
index 4198ef2defa7f24d89bd70d1bf4d179be6c4e274..aaf24d3830b7adc8893b302712158ec8a2679664 100644
--- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt b/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt
index bc9900bde930e18dea026ae0db5bf707db5b03da..eddc4d3a1fd1a866e8016766080b76431861c407 100644
--- a/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt
+++ b/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt
@@ -143,35 +143,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 48
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -179,7 +151,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 48
+                      "column": 41
                     }
                   }
                 },
@@ -230,35 +202,7 @@
               "type": "ETSFunctionType",
               "params": [],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 23
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 16,
-                      "column": 19
-                    },
-                    "end": {
-                      "line": 16,
-                      "column": 30
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 16,
@@ -266,7 +210,7 @@
                   },
                   "end": {
                     "line": 16,
-                    "column": 30
+                    "column": 23
                   }
                 }
               }
@@ -278,7 +222,7 @@
                 },
                 "end": {
                   "line": 16,
-                  "column": 30
+                  "column": 23
                 }
               }
             },
@@ -462,35 +406,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 114
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 118
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 114
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 127
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -498,7 +414,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 127
+                      "column": 118
                     }
                   }
                 },
@@ -689,35 +605,7 @@
                 }
               ],
               "returnType": {
-                "type": "ETSTypeReference",
-                "part": {
-                  "type": "ETSTypeReferencePart",
-                  "name": {
-                    "type": "Identifier",
-                    "name": "void",
-                    "decorators": [],
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 58
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 62
-                      }
-                    }
-                  },
-                  "loc": {
-                    "start": {
-                      "line": 18,
-                      "column": 58
-                    },
-                    "end": {
-                      "line": 18,
-                      "column": 69
-                    }
-                  }
-                },
+                "type": "ETSPrimitiveType",
                 "loc": {
                   "start": {
                     "line": 18,
@@ -725,7 +613,7 @@
                   },
                   "end": {
                     "line": 18,
-                    "column": 69
+                    "column": 62
                   }
                 }
               }
@@ -737,7 +625,7 @@
                 },
                 "end": {
                   "line": 18,
-                  "column": 69
+                  "column": 62
                 }
               }
             },
diff --git a/ets2panda/test/parser/ets/launch-expected.txt b/ets2panda/test/parser/ets/launch-expected.txt
index 69354243b1d1ca4f3b29e72b95bd50bf9cca5bdd..2abcf171d9d2c195ce042661e1d34cc660c38dcf 100755
--- a/ets2panda/test/parser/ets/launch-expected.txt
+++ b/ets2panda/test/parser/ets/launch-expected.txt
@@ -1326,35 +1326,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 35,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 35,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 35,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 35,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 35,
@@ -1362,7 +1334,7 @@
                     },
                     "end": {
                       "line": 35,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -2363,35 +2335,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 44,
-                                        "column": 21
-                                      },
-                                      "end": {
-                                        "line": 44,
-                                        "column": 25
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 44,
-                                      "column": 21
-                                    },
-                                    "end": {
-                                      "line": 44,
-                                      "column": 27
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 44,
@@ -2399,7 +2343,7 @@
                                   },
                                   "end": {
                                     "line": 44,
-                                    "column": 27
+                                    "column": 25
                                   }
                                 }
                               },
@@ -2410,7 +2354,7 @@
                                 },
                                 "end": {
                                   "line": 44,
-                                  "column": 27
+                                  "column": 25
                                 }
                               }
                             },
@@ -2436,35 +2380,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 44,
-                                        "column": 32
-                                      },
-                                      "end": {
-                                        "line": 44,
-                                        "column": 36
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 44,
-                                      "column": 32
-                                    },
-                                    "end": {
-                                      "line": 44,
-                                      "column": 39
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 44,
@@ -2472,7 +2388,7 @@
                                   },
                                   "end": {
                                     "line": 44,
-                                    "column": 39
+                                    "column": 36
                                   }
                                 }
                               },
diff --git a/ets2panda/test/parser/ets/launch_ret-expected.txt b/ets2panda/test/parser/ets/launch_ret-expected.txt
index 8c013e1a17aa9c83a1ce14a2a26efc33d1fb8a76..e6a23877ca7aeb66aaf8988b3679ed700fd651fa 100644
--- a/ets2panda/test/parser/ets/launch_ret-expected.txt
+++ b/ets2panda/test/parser/ets/launch_ret-expected.txt
@@ -297,35 +297,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -333,7 +305,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/launch_super-expected.txt b/ets2panda/test/parser/ets/launch_super-expected.txt
index 740ef6c10d1e1feec7df4bd6669fb5199fec19cb..20aab1a491687cefd4d70789f6464ef355014c6b 100755
--- a/ets2panda/test/parser/ets/launch_super-expected.txt
+++ b/ets2panda/test/parser/ets/launch_super-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/launch_unresolved-expected.txt b/ets2panda/test/parser/ets/launch_unresolved-expected.txt
index fbe801324eefb64a488b82c8458e1c547694ca9a..65f5bc0ae751429670f2607e2b4bb056ead9980e 100755
--- a/ets2panda/test/parser/ets/launch_unresolved-expected.txt
+++ b/ets2panda/test/parser/ets/launch_unresolved-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/loops-expected.txt b/ets2panda/test/parser/ets/loops-expected.txt
index c30aa0c543d6905a26aa534fdad4bcb7447d2de7..1ea34dabb415d734e24c1be91436475a3b6a86b8 100644
--- a/ets2panda/test/parser/ets/loops-expected.txt
+++ b/ets2panda/test/parser/ets/loops-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -915,35 +887,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 27,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 27,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 27,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 27,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 27,
@@ -951,7 +895,7 @@
                     },
                     "end": {
                       "line": 27,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -1133,35 +1077,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 34,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 34,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 34,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 34,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 34,
@@ -1169,7 +1085,7 @@
                     },
                     "end": {
                       "line": 34,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
@@ -1581,35 +1497,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 46,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 46,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 46,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 46,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 46,
@@ -1617,7 +1505,7 @@
                     },
                     "end": {
                       "line": 46,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
@@ -2119,35 +2007,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 57,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 57,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 57,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 57,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 57,
@@ -2155,7 +2015,7 @@
                     },
                     "end": {
                       "line": 57,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt
index 66bc2887d31796ff933be6cbbc74fc35d726f329..0d70eb572e5203475c197fbe855b32225333ff3a 100644
--- a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/main_entry_point_3-expected.txt b/ets2panda/test/parser/ets/main_entry_point_3-expected.txt
index ce107284504b8af1f030c975a4f5d4a8dd791b1b..72cb9f1b8a7cef9ef2eb134f66647c8e155ede0c 100644
--- a/ets2panda/test/parser/ets/main_entry_point_3-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_3-expected.txt
@@ -217,35 +217,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -253,7 +225,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 33
+                      "column": 31
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/main_entry_point_4-expected.txt b/ets2panda/test/parser/ets/main_entry_point_4-expected.txt
index 038926786ebb3f18ea8c20db071afda164121848..9a799098454afd9feb33e774c27c07e165bf1e1d 100644
--- a/ets2panda/test/parser/ets/main_entry_point_4-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_4-expected.txt
@@ -258,35 +258,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 43
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -294,7 +266,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 43
+                      "column": 41
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt
index f1b23c2fdebad8e4646cfa6c826cc8710ccb55be..093803aa4feb93e8c3c588fb224070192283216c 100644
--- a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt
@@ -245,35 +245,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 30
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 34
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 36
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -281,7 +253,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 36
+                      "column": 34
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt
index 4d502fcf3b1cc4647de8e60dcd92399ff5bfea08..2dc6b78535c6f22560fb203ed5a277e05cc89617 100644
--- a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt
@@ -640,35 +640,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -676,7 +648,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt
index 406da83ac137244be952f94c6f49ac4bc6988a64..398b09b8b1bc84b2c41bb3a797b3a405fc1b6ac9 100644
--- a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt
@@ -314,35 +314,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -350,7 +322,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 33
+                      "column": 31
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt
index 8ab846bcea64ef809aeb3bef727cda3ecf6cdfb0..d4b95fa07d47e24002d5eec8283dad12764e42ff 100644
--- a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt
+++ b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt
@@ -314,35 +314,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -350,7 +322,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt b/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt
index 385bd2bde770c0e075e588253d6509b1dd52dc93..612c4addfb45e67b51019ad3c35399743e97a294 100644
--- a/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt
+++ b/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 27
                     }
                   }
                 },
@@ -344,35 +316,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 63
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 67
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 63
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 76
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -380,7 +324,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 76
+                      "column": 67
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_empty-expected.txt b/ets2panda/test/parser/ets/method_empty-expected.txt
index 9b59904d9cb8e535818238cc73ec8e551a3a6f5a..f0f97178b4fd585a9d3fd95b43c7c169917cd433 100644
--- a/ets2panda/test/parser/ets/method_empty-expected.txt
+++ b/ets2panda/test/parser/ets/method_empty-expected.txt
@@ -208,35 +208,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -244,7 +216,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -373,35 +345,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 21,
-                              "column": 27
-                            },
-                            "end": {
-                              "line": 21,
-                              "column": 31
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 21,
-                            "column": 27
-                          },
-                          "end": {
-                            "line": 21,
-                            "column": 33
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 21,
@@ -409,7 +353,7 @@
                         },
                         "end": {
                           "line": 21,
-                          "column": 33
+                          "column": 31
                         }
                       }
                     },
@@ -563,35 +507,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -599,7 +515,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_full-expected.txt b/ets2panda/test/parser/ets/method_full-expected.txt
index 217d377aeb81529cf397e8e06a8ea30687bcc0f3..963b8b949b847150c4e055d6a13fcb7008f3d25c 100644
--- a/ets2panda/test/parser/ets/method_full-expected.txt
+++ b/ets2panda/test/parser/ets/method_full-expected.txt
@@ -208,35 +208,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -244,7 +216,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 18
+                      "column": 16
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt
index e3224b8f8f3bbf0aa64d7555d1d021b5ae5a3505..bfbe5b729d913700eba1419c1f723053872009db 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt
index 36c6d3daea0d1be25d2058e9da6ea20447a43c17..53c6577011e3744d1acc25a162f394156366be39 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt
index 781cc3889a5d83bcd17f419748340a842c2c83dc..b69337a9f14ac6185442e6aa03b197ad6eff6fb5 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt
index 13dcd8b708b5e8d7a6eca1e16ef4d1ff3225a4bb..ff3d4b77868a6ab0f62b172d72fa1ca799f8fe67 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt
index 5b259a8453bd9bdc414c72e0ccbbd0651bc18c17..c927ad4f19d3fa9138cd1a27c4c3a6b770a56f5a 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 33
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt
index 7365c0e39779dda117d50a5ed5c493fcbd1b951e..6620974883b5cb4dd5625a84b0fced474111cd74 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 32
+                      "column": 31
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt
index adf31a8145e009aaba67d59111110f30bbe36909..6529f2d724579150f9e84acae17b1311d25491a1 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 31
+                      "column": 30
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt
index f7aa11dedc2c0254e70aa71a93f6f92dcdb6c98d..c2dbfc461803c0eea1131a45bd38b916721441ab 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 33
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt
index de3b52cd12043edf44d85550a5b889d7cfc567b3..dbf48ae86f7589adc2ff035b231cb1db45d2d5d2 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 33
+                      "column": 31
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt
index b29e6a461c21d36f8446eef7625361443ca25a19..deb246e3ec97e2319f805587c75af61d2f5128df 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 30
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 34
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 36
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 36
+                      "column": 34
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt
index 552012fcd15685deac6e11ae7fd2c0e937f7b5d7..530f0bd203a25521320d519c1a7338da16f27b07 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt
index fc02f417b40e5108d1ea492bba5e4ac32a50f277..cbdd0544e88610ca4c9091ad07f5c3b57833afe8 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt
index 8db996a9f03a18b0108c4d5dbefd108a9bb1492e..06769206a401d924cd2cecc65e4d3ab2aee0f0d7 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt
index e8b4bbfc7ba1ca8f3e85019a66019597d6d63928..5f04dd8bb0fd71a64fc5d409fa3998030dae3090 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 34
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt
index 7365c0e39779dda117d50a5ed5c493fcbd1b951e..6620974883b5cb4dd5625a84b0fced474111cd74 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 32
+                      "column": 31
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt
index d3627937d05fece5d92d4ab6c890b5e2d15151dc..8492bc5358251f0d655ac6a2addbeb73aa2b69b6 100644
--- a/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt
+++ b/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 28
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 32
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 28
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 33
+                      "column": 32
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_override_throw_1-expected.txt b/ets2panda/test/parser/ets/method_override_throw_1-expected.txt
index 5e54b382c87b044e9bed0c134be13da6a0b196f1..a86584646599d6c4198688e5a483e0b6a4d2bb8f 100644
--- a/ets2panda/test/parser/ets/method_override_throw_1-expected.txt
+++ b/ets2panda/test/parser/ets/method_override_throw_1-expected.txt
@@ -52,35 +52,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -88,7 +60,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 17
                     }
                   }
                 },
@@ -101,7 +73,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 24
+                    "column": 17
                   }
                 }
               },
@@ -112,7 +84,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 24
+                  "column": 17
                 }
               }
             },
@@ -183,35 +155,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 18,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 18,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 18,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 18,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 18,
@@ -219,7 +163,7 @@
                             },
                             "end": {
                               "line": 18,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -231,7 +175,7 @@
                           },
                           "end": {
                             "line": 18,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -243,7 +187,7 @@
                         },
                         "end": {
                           "line": 18,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -254,41 +198,13 @@
                       },
                       "end": {
                         "line": 18,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 50
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -296,7 +212,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 50
+                      "column": 41
                     }
                   }
                 },
@@ -309,7 +225,7 @@
                   },
                   "end": {
                     "line": 18,
-                    "column": 50
+                    "column": 41
                   }
                 }
               },
@@ -320,7 +236,7 @@
                 },
                 "end": {
                   "line": 18,
-                  "column": 50
+                  "column": 41
                 }
               }
             },
@@ -383,35 +299,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -419,7 +307,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 18
+                      "column": 17
                     }
                   }
                 },
@@ -431,7 +319,7 @@
                   },
                   "end": {
                     "line": 19,
-                    "column": 18
+                    "column": 17
                   }
                 }
               },
@@ -442,7 +330,7 @@
                 },
                 "end": {
                   "line": 19,
-                  "column": 18
+                  "column": 17
                 }
               }
             },
@@ -620,35 +508,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -656,7 +516,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 33
+                      "column": 26
                     }
                   }
                 },
@@ -764,35 +624,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 24,
-                                  "column": 32
-                                },
-                                "end": {
-                                  "line": 24,
-                                  "column": 36
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 24,
-                                "column": 32
-                              },
-                              "end": {
-                                "line": 24,
-                                "column": 43
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 24,
@@ -800,7 +632,7 @@
                             },
                             "end": {
                               "line": 24,
-                              "column": 43
+                              "column": 36
                             }
                           }
                         }
@@ -812,7 +644,7 @@
                           },
                           "end": {
                             "line": 24,
-                            "column": 43
+                            "column": 36
                           }
                         }
                       },
@@ -824,7 +656,7 @@
                         },
                         "end": {
                           "line": 24,
-                          "column": 43
+                          "column": 36
                         }
                       }
                     },
@@ -835,41 +667,13 @@
                       },
                       "end": {
                         "line": 24,
-                        "column": 43
+                        "column": 36
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 50
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 46
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 59
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -877,7 +681,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 59
+                      "column": 50
                     }
                   }
                 },
@@ -977,35 +781,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 25,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 25,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 25,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 25,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 25,
@@ -1013,7 +789,7 @@
                     },
                     "end": {
                       "line": 25,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
@@ -1249,35 +1025,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 29,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 29,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 29,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 29,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 29,
@@ -1285,7 +1033,7 @@
                     },
                     "end": {
                       "line": 29,
-                      "column": 24
+                      "column": 17
                     }
                   }
                 },
@@ -1393,35 +1141,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 30,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 30,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 30,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 30,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 30,
@@ -1429,7 +1149,7 @@
                             },
                             "end": {
                               "line": 30,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -1441,7 +1161,7 @@
                           },
                           "end": {
                             "line": 30,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -1453,7 +1173,7 @@
                         },
                         "end": {
                           "line": 30,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -1464,41 +1184,13 @@
                       },
                       "end": {
                         "line": 30,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 37
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 41
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 37
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 50
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -1506,7 +1198,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 50
+                      "column": 41
                     }
                   }
                 },
@@ -1606,35 +1298,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 31,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 31,
-                          "column": 17
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 31,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 31,
-                        "column": 19
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 31,
@@ -1642,7 +1306,7 @@
                     },
                     "end": {
                       "line": 31,
-                      "column": 19
+                      "column": 17
                     }
                   }
                 },
@@ -1918,35 +1582,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 35,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 35,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 35,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 35,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 35,
@@ -1954,7 +1590,7 @@
                     },
                     "end": {
                       "line": 35,
-                      "column": 33
+                      "column": 26
                     }
                   }
                 },
@@ -2062,35 +1698,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 36,
-                                  "column": 32
-                                },
-                                "end": {
-                                  "line": 36,
-                                  "column": 36
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 36,
-                                "column": 32
-                              },
-                              "end": {
-                                "line": 36,
-                                "column": 43
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 36,
@@ -2098,7 +1706,7 @@
                             },
                             "end": {
                               "line": 36,
-                              "column": 43
+                              "column": 36
                             }
                           }
                         }
@@ -2110,7 +1718,7 @@
                           },
                           "end": {
                             "line": 36,
-                            "column": 43
+                            "column": 36
                           }
                         }
                       },
@@ -2122,7 +1730,7 @@
                         },
                         "end": {
                           "line": 36,
-                          "column": 43
+                          "column": 36
                         }
                       }
                     },
@@ -2133,41 +1741,13 @@
                       },
                       "end": {
                         "line": 36,
-                        "column": 43
+                        "column": 36
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 36,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 36,
-                          "column": 50
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 36,
-                        "column": 46
-                      },
-                      "end": {
-                        "line": 36,
-                        "column": 59
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 36,
@@ -2175,7 +1755,7 @@
                     },
                     "end": {
                       "line": 36,
-                      "column": 59
+                      "column": 50
                     }
                   }
                 },
@@ -2275,35 +1855,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 37,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 37,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 37,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 37,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 37,
@@ -2311,7 +1863,7 @@
                     },
                     "end": {
                       "line": 37,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_override_throw_2-expected.txt b/ets2panda/test/parser/ets/method_override_throw_2-expected.txt
index 4dcd12776b211e29acebaa6699ac9daed47dea74..76adc106eb6f36c2c29a0159bda4222ca42ada26 100644
--- a/ets2panda/test/parser/ets/method_override_throw_2-expected.txt
+++ b/ets2panda/test/parser/ets/method_override_throw_2-expected.txt
@@ -52,35 +52,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -88,7 +60,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 23
+                      "column": 16
                     }
                   }
                 },
@@ -101,7 +73,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 23
+                    "column": 16
                   }
                 }
               },
@@ -112,7 +84,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 23
+                  "column": 16
                 }
               }
             },
@@ -290,35 +262,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -326,7 +270,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_override_throw_3-expected.txt b/ets2panda/test/parser/ets/method_override_throw_3-expected.txt
index e340f841238425ed050e7edea750791e8ebde1aa..55296515869f5d6fc694c97772e47e947f506073 100644
--- a/ets2panda/test/parser/ets/method_override_throw_3-expected.txt
+++ b/ets2panda/test/parser/ets/method_override_throw_3-expected.txt
@@ -60,35 +60,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 22
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 26
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 22
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 33
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -96,7 +68,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 33
+                              "column": 26
                             }
                           }
                         }
@@ -108,7 +80,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 33
+                            "column": 26
                           }
                         }
                       },
@@ -120,7 +92,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 33
+                          "column": 26
                         }
                       }
                     },
@@ -131,41 +103,13 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 33
+                        "column": 26
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 36
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 40
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 36
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 49
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -173,7 +117,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 49
+                      "column": 40
                     }
                   }
                 },
@@ -186,7 +130,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 49
+                    "column": 40
                   }
                 }
               },
@@ -197,7 +141,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 49
+                  "column": 40
                 }
               }
             },
@@ -383,35 +327,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 31
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 35
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 31
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 42
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 21,
@@ -419,7 +335,7 @@
                             },
                             "end": {
                               "line": 21,
-                              "column": 42
+                              "column": 35
                             }
                           }
                         }
@@ -431,7 +347,7 @@
                           },
                           "end": {
                             "line": 21,
-                            "column": 42
+                            "column": 35
                           }
                         }
                       },
@@ -443,7 +359,7 @@
                         },
                         "end": {
                           "line": 21,
-                          "column": 42
+                          "column": 35
                         }
                       }
                     },
@@ -454,41 +370,13 @@
                       },
                       "end": {
                         "line": 21,
-                        "column": 42
+                        "column": 35
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 45
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 49
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 45
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 56
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -496,7 +384,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 56
+                      "column": 49
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_override_throw_4-expected.txt b/ets2panda/test/parser/ets/method_override_throw_4-expected.txt
index 873680b14527b09dbb76130feed26efb0483edd9..f9adc536202ccd05e73ac34ef52e936ed4dca6fb 100644
--- a/ets2panda/test/parser/ets/method_override_throw_4-expected.txt
+++ b/ets2panda/test/parser/ets/method_override_throw_4-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 22
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 26
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 22
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 33
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 33
+                              "column": 26
                             }
                           }
                         }
@@ -124,7 +96,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 33
+                            "column": 26
                           }
                         }
                       },
@@ -136,7 +108,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 33
+                          "column": 26
                         }
                       }
                     },
@@ -147,41 +119,13 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 33
+                        "column": 26
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 36
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 40
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 36
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 49
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -189,7 +133,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 49
+                      "column": 40
                     }
                   }
                 },
@@ -474,35 +418,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 21,
-                                  "column": 31
-                                },
-                                "end": {
-                                  "line": 21,
-                                  "column": 35
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 21,
-                                "column": 31
-                              },
-                              "end": {
-                                "line": 21,
-                                "column": 42
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 21,
@@ -510,7 +426,7 @@
                             },
                             "end": {
                               "line": 21,
-                              "column": 42
+                              "column": 35
                             }
                           }
                         }
@@ -522,7 +438,7 @@
                           },
                           "end": {
                             "line": 21,
-                            "column": 42
+                            "column": 35
                           }
                         }
                       },
@@ -534,7 +450,7 @@
                         },
                         "end": {
                           "line": 21,
-                          "column": 42
+                          "column": 35
                         }
                       }
                     },
@@ -545,41 +461,13 @@
                       },
                       "end": {
                         "line": 21,
-                        "column": 42
+                        "column": 35
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 45
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 49
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 45
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 51
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -587,7 +475,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 51
+                      "column": 49
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_override_throw_5-expected.txt b/ets2panda/test/parser/ets/method_override_throw_5-expected.txt
index 1ad87dcfb417c6cfdddd54d44d04d5b4c8bf43b0..9f006735a84901ecaab2abd8a13caf61fb019844 100644
--- a/ets2panda/test/parser/ets/method_override_throw_5-expected.txt
+++ b/ets2panda/test/parser/ets/method_override_throw_5-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 23
+                      "column": 16
                     }
                   }
                 },
@@ -381,35 +353,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 34
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -417,7 +361,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 34
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/method_override_throw_6-expected.txt b/ets2panda/test/parser/ets/method_override_throw_6-expected.txt
index 90934c6a03f7939a1c29d0a2e37b015af73787a1..bb00d0e8c39985a5f6141a9a50fc21c33aece261 100644
--- a/ets2panda/test/parser/ets/method_override_throw_6-expected.txt
+++ b/ets2panda/test/parser/ets/method_override_throw_6-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 30
+                      "column": 23
                     }
                   }
                 },
@@ -381,35 +353,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -417,7 +361,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/methods-expected.txt b/ets2panda/test/parser/ets/methods-expected.txt
index c6795d18fd8cafddc24233876aa89aca21101102..334e66e7c548f76f0614e0679d81e06404193a96 100644
--- a/ets2panda/test/parser/ets/methods-expected.txt
+++ b/ets2panda/test/parser/ets/methods-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 8
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 12
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 8
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 14
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 14
+                      "column": 12
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 15
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 19
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 15
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 21
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 21
+                      "column": 19
                     }
                   }
                 },
@@ -338,35 +282,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -374,7 +290,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
@@ -473,35 +389,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 22
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 26
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 22
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 28
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -509,7 +397,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 28
+                      "column": 26
                     }
                   }
                 },
@@ -608,35 +496,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -644,7 +504,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -743,35 +603,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -779,7 +611,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -878,35 +710,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -914,7 +718,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
@@ -1150,35 +954,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -1186,7 +962,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 22
+                      "column": 21
                     }
                   }
                 },
@@ -1448,35 +1224,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 32,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 32,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 32,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 32,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 32,
@@ -1484,7 +1232,7 @@
                     },
                     "end": {
                       "line": 32,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
@@ -1720,35 +1468,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 36,
-                          "column": 8
-                        },
-                        "end": {
-                          "line": 36,
-                          "column": 12
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 36,
-                        "column": 8
-                      },
-                      "end": {
-                        "line": 36,
-                        "column": 13
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 36,
@@ -1756,7 +1476,7 @@
                     },
                     "end": {
                       "line": 36,
-                      "column": 13
+                      "column": 12
                     }
                   }
                 },
@@ -2018,35 +1738,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 40,
-                          "column": 17
-                        },
-                        "end": {
-                          "line": 40,
-                          "column": 21
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 40,
-                        "column": 17
-                      },
-                      "end": {
-                        "line": 40,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 40,
@@ -2054,7 +1746,7 @@
                     },
                     "end": {
                       "line": 40,
-                      "column": 23
+                      "column": 21
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt b/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt
index 10346aee633521776c60fa9e287a6b322eaff3e8..f3afece13167b1cbe8f12d3c3c9071087338b23c 100644
--- a/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt
+++ b/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt b/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt
index 57e9c0bfdeadebf18cd10bcaa389d9bd0c7b28f2..7e8e2d1387138b18ce8b542248aaf95d7815ad4c 100644
--- a/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt
+++ b/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt
@@ -503,35 +503,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -539,7 +511,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt b/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt
index 5698d12fe67bacf68dc54ada5347f73591a888de..092898e78736a58109ff6a40d4bd0994821427d0 100644
--- a/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt
@@ -503,35 +503,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -539,7 +511,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt b/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt
index ff8820fa74e1a33275c5f7950b96ca1814136a48..3e3a209b20c642adb1ca71ac84595a00999f2e7d 100644
--- a/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt
+++ b/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt
@@ -299,35 +299,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -335,7 +307,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt b/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt
index c5df8b793939af578e1f314d0ab055d0db771f7f..3379a64386996dcc183ebe4675d09a487216cd01 100644
--- a/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt
+++ b/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt
@@ -299,35 +299,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -335,7 +307,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt b/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt
index 28ddeff4fb1ce3f0c310d9a4dc4298e59b0c7084..ebd9e4a09c22e39fcb56372df5291198b178e920 100644
--- a/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt
+++ b/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt
@@ -368,35 +368,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -404,7 +376,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt b/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt
index 229bee6d941c69d7ebe0c589517154c7e9ccf23e..55b9225a855550ffc10de41bdb2c4a3873ecfbdc 100644
--- a/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt
@@ -369,35 +369,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -405,7 +377,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
@@ -504,35 +476,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -540,7 +484,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt
index 9e0b6dfba65ec74006a89978d032094fd9a99e23..3b11585077fe862ed9636c4130993132698af799 100644
--- a/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt
@@ -122,35 +122,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 23
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -158,7 +130,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 23
+                      "column": 22
                     }
                   }
                 },
@@ -170,7 +142,7 @@
                   },
                   "end": {
                     "line": 17,
-                    "column": 23
+                    "column": 22
                   }
                 }
               },
@@ -181,7 +153,7 @@
                 },
                 "end": {
                   "line": 17,
-                  "column": 23
+                  "column": 22
                 }
               }
             },
@@ -429,35 +401,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -465,7 +409,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -795,35 +739,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -831,7 +747,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt
index d671817126263aa1cff99ab62ce20a4d19d6daf2..e162fcbd20c96a4f63a69a91f6719e7d1b73f544 100644
--- a/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt
+++ b/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt
@@ -138,35 +138,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -174,7 +146,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -504,35 +476,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -540,7 +484,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt
index 06d46c9314a2ef2700f58d44715aab79e39c3e7d..6b68f38ad1ecbb018f2fda36ae3618faba995490 100644
--- a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt
+++ b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 29
+                      "column": 28
                     }
                   }
                 },
@@ -283,35 +255,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -319,7 +263,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt b/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt
index 7f087614acaa7a8be5961961fc1b774388e8db18..433ebc942b0828f41fb239772eb3ec217829f0a5 100644
--- a/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt
+++ b/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt
@@ -242,35 +242,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -278,7 +250,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/new_expressions-expected.txt b/ets2panda/test/parser/ets/new_expressions-expected.txt
index df3ea624564f7f633f303145c38d00fc7489826d..b4101bed1b84556ec612c9408ff3f48dd82416c2 100644
--- a/ets2panda/test/parser/ets/new_expressions-expected.txt
+++ b/ets2panda/test/parser/ets/new_expressions-expected.txt
@@ -300,35 +300,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -336,7 +308,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/new_object_3-expected.txt b/ets2panda/test/parser/ets/new_object_3-expected.txt
index 84dc0a7207ceabfd28c481da1ab14b28d9fa1c9d..bba00c3c4e0ef26fdb6268b1ba86c73f5f698cc4 100644
--- a/ets2panda/test/parser/ets/new_object_3-expected.txt
+++ b/ets2panda/test/parser/ets/new_object_3-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 19
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt b/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt
index c714438db06cf98f22f5cea797e7e1eff537c989..67646bd14f6a435a32a5989f85b82a3459beea7c 100644
--- a/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt
+++ b/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt
@@ -164,35 +164,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 46
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 50
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 46
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 52
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -200,7 +172,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 52
+                      "column": 50
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/null-expected.txt b/ets2panda/test/parser/ets/null-expected.txt
index f069f5a6a679ab99caee7be78a77b7c0c31c644c..b89c073b6918cc62ef61457ce624d55eb8b82bde 100644
--- a/ets2panda/test/parser/ets/null-expected.txt
+++ b/ets2panda/test/parser/ets/null-expected.txt
@@ -677,35 +677,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 33
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 37
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 33
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 39
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -713,7 +685,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 39
+                      "column": 37
                     }
                   }
                 },
@@ -812,35 +784,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -848,7 +792,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/nullableType-expected.txt b/ets2panda/test/parser/ets/nullableType-expected.txt
index ed0d54068514e413f44c031d2e948014ed8deeff..1dac23b14025c46af8d84714e8cf6174433875ed 100644
--- a/ets2panda/test/parser/ets/nullableType-expected.txt
+++ b/ets2panda/test/parser/ets/nullableType-expected.txt
@@ -1591,35 +1591,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -1627,7 +1599,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -1856,35 +1828,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 30,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 30,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 30,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 30,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 30,
@@ -1892,7 +1836,7 @@
                     },
                     "end": {
                       "line": 30,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
@@ -4473,35 +4417,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 65,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 65,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 65,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 65,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 65,
@@ -4509,7 +4425,7 @@
                     },
                     "end": {
                       "line": 65,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -4820,35 +4736,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 70,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 70,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 70,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 70,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 70,
@@ -4856,7 +4744,7 @@
                     },
                     "end": {
                       "line": 70,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -9296,35 +9184,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 144,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 144,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 144,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 144,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 144,
@@ -9332,7 +9192,7 @@
                     },
                     "end": {
                       "line": 144,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/nullable_union_array-expected.txt b/ets2panda/test/parser/ets/nullable_union_array-expected.txt
index 25904e3cab4eaca073da67d15d40ab32eeaaf027..056f6ae37d31cd1a2afff5a30ae3ef62febca656 100644
--- a/ets2panda/test/parser/ets/nullable_union_array-expected.txt
+++ b/ets2panda/test/parser/ets/nullable_union_array-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt
index a48d7291b63b3dff98f8a8e48ad7e488a70721dd..0c7ecd5bd97660f2abe92a2a3b0b866b59401d51 100644
--- a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt
+++ b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt
@@ -1371,35 +1371,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -1407,7 +1379,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt
index 32bc14b3a4b55db92bda2c320d9de403f2147a19..0f1c91d2a81301a66e20b201ff79fd4e3d5631ef 100644
--- a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt
+++ b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt
@@ -589,35 +589,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -625,7 +597,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/property-access-method-1-expected.txt b/ets2panda/test/parser/ets/property-access-method-1-expected.txt
index 58a190143cb0591cd3aa410ce907c305b7e18c85..3eeff6b372dea2b7835f0423e083b7b2edf1980d 100644
--- a/ets2panda/test/parser/ets/property-access-method-1-expected.txt
+++ b/ets2panda/test/parser/ets/property-access-method-1-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/property-access-method-2-expected.txt b/ets2panda/test/parser/ets/property-access-method-2-expected.txt
index 4e8f87355369927e6451b1ae41906e5711fb904f..63383abaa138a3167321dd36274348ffb64619a7 100644
--- a/ets2panda/test/parser/ets/property-access-method-2-expected.txt
+++ b/ets2panda/test/parser/ets/property-access-method-2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 18
+                      "column": 16
                     }
                   }
                 },
@@ -203,35 +175,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -239,7 +183,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 29
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt
index 20b3942afa9487ecff4c39d57e45c9aa7f783ef7..8fdba8b82385b748d65abdd4757a81b8a3c36e41 100644
--- a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt
+++ b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt
@@ -152,35 +152,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 38
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 42
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 38
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 44
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -188,7 +160,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 44
+                      "column": 42
                     }
                   }
                 },
@@ -386,35 +358,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 1,
-                              "column": 3
-                            },
-                            "end": {
-                              "line": 1,
-                              "column": 3
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 1,
-                            "column": 3
-                          },
-                          "end": {
-                            "line": 1,
-                            "column": 3
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 1,
@@ -890,35 +834,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 29
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 33
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 29
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 35
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -926,7 +842,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 35
+                      "column": 33
                     }
                   }
                 },
@@ -1124,35 +1040,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 1,
-                              "column": 3
-                            },
-                            "end": {
-                              "line": 1,
-                              "column": 3
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 1,
-                            "column": 3
-                          },
-                          "end": {
-                            "line": 1,
-                            "column": 3
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 1,
diff --git a/ets2panda/test/parser/ets/re_export/export-expected.txt b/ets2panda/test/parser/ets/re_export/export-expected.txt
index ab233733e635f52edc9f3be1eb1e8742e10c291a..ff110370791750646a88fb28e30191a7fd0b73c5 100644
--- a/ets2panda/test/parser/ets/re_export/export-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/export-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 23
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/export_2-expected.txt b/ets2panda/test/parser/ets/re_export/export_2-expected.txt
index ab233733e635f52edc9f3be1eb1e8742e10c291a..ff110370791750646a88fb28e30191a7fd0b73c5 100644
--- a/ets2panda/test/parser/ets/re_export/export_2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/export_2-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 23
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt
index ab233733e635f52edc9f3be1eb1e8742e10c291a..ff110370791750646a88fb28e30191a7fd0b73c5 100644
--- a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 23
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt
index ab233733e635f52edc9f3be1eb1e8742e10c291a..ff110370791750646a88fb28e30191a7fd0b73c5 100644
--- a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt
@@ -162,43 +162,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 23
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 27
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 23
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
                       "column": 23
                     },
                     "end": {
-                      "line": 17,
-                      "column": 2
+                      "line": 16,
+                      "column": 27
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import-expected.txt b/ets2panda/test/parser/ets/re_export/import-expected.txt
index 398ea0e512cc158af39479c9c738c25e5c5ce586..51e73c758090862ee882c1fd4bdc27dceb728eef 100644
--- a/ets2panda/test/parser/ets/re_export/import-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import_2-expected.txt b/ets2panda/test/parser/ets/re_export/import_2-expected.txt
index 6c96d8cb74662cd7fa90a9a9bdf32cf30ebae34f..f77189776f91abe9a8eab97a4724def0615f3d80 100644
--- a/ets2panda/test/parser/ets/re_export/import_2-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_2-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import_3-expected.txt b/ets2panda/test/parser/ets/re_export/import_3-expected.txt
index 90b1934eec6f97fb99dd55323dff9b32c8763df5..e75b59874c7c7f8c28bda7a655156253388fa17c 100644
--- a/ets2panda/test/parser/ets/re_export/import_3-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_3-expected.txt
@@ -234,43 +234,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import_4-expected.txt b/ets2panda/test/parser/ets/re_export/import_4-expected.txt
index 7009eff8fed45f1b293c7172a11969dcad2cead1..7fd98dc2b7c372af3448b9f92b9bba38cadbcfab 100644
--- a/ets2panda/test/parser/ets/re_export/import_4-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_4-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import_5-expected.txt b/ets2panda/test/parser/ets/re_export/import_5-expected.txt
index 067ad6e2c9588c20d034c2f39d81e1cb723f84a7..bee49338b415ec6e14c61c6d81e5aa1409aada78 100644
--- a/ets2panda/test/parser/ets/re_export/import_5-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_5-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import_6-expected.txt b/ets2panda/test/parser/ets/re_export/import_6-expected.txt
index be710cd392231620906af1a994ae92bcd29a0f77..a98fb176e33ecf19a96c00c21ff8e6ebb56b1aea 100644
--- a/ets2panda/test/parser/ets/re_export/import_6-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_6-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import_7-expected.txt b/ets2panda/test/parser/ets/re_export/import_7-expected.txt
index 9fdb5dec9010b7152fa576de450e144c79773771..39b4be1f1f6eabbb05968bef2ef075ed184aea59 100644
--- a/ets2panda/test/parser/ets/re_export/import_7-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_7-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/re_export/import_8-expected.txt b/ets2panda/test/parser/ets/re_export/import_8-expected.txt
index be710cd392231620906af1a994ae92bcd29a0f77..a98fb176e33ecf19a96c00c21ff8e6ebb56b1aea 100644
--- a/ets2panda/test/parser/ets/re_export/import_8-expected.txt
+++ b/ets2panda/test/parser/ets/re_export/import_8-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt
index a287010dbf2d5592335a08f4b0e156dff1fad92c..8c09e57e3f77ca9b07cee08d55400dfd55487af3 100644
--- a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt
+++ b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt
@@ -873,35 +873,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 14
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 18
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 14
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 20
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -909,7 +881,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 20
+                      "column": 18
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/rethrow-func-1-expected.txt b/ets2panda/test/parser/ets/rethrow-func-1-expected.txt
index 0427944a2845e4bc65d0ff67d742bdba27395e98..0d1ec375f8bfcee3828aa3be77755f6efb2c88d9 100644
--- a/ets2panda/test/parser/ets/rethrow-func-1-expected.txt
+++ b/ets2panda/test/parser/ets/rethrow-func-1-expected.txt
@@ -22,35 +22,7 @@
         "type": "ETSFunctionType",
         "params": [],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 24
-                },
-                "end": {
-                  "line": 16,
-                  "column": 28
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 24
-              },
-              "end": {
-                "line": 16,
-                "column": 35
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
@@ -58,7 +30,7 @@
             },
             "end": {
               "line": 16,
-              "column": 35
+              "column": 28
             }
           }
         }
@@ -70,7 +42,7 @@
           },
           "end": {
             "line": 16,
-            "column": 35
+            "column": 28
           }
         }
       },
@@ -543,35 +515,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -579,7 +523,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -657,35 +601,7 @@
                               "expression": false,
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 24,
-                                        "column": 33
-                                      },
-                                      "end": {
-                                        "line": 24,
-                                        "column": 37
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 24,
-                                      "column": 33
-                                    },
-                                    "end": {
-                                      "line": 24,
-                                      "column": 40
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 24,
@@ -693,7 +609,7 @@
                                   },
                                   "end": {
                                     "line": 24,
-                                    "column": 40
+                                    "column": 37
                                   }
                                 }
                               },
diff --git a/ets2panda/test/parser/ets/return-expected.txt b/ets2panda/test/parser/ets/return-expected.txt
index ee83fa8590954398b414c31cfa2e74c94becba16..f1aa88b4641ef17b96cb582bf110bf745da28dd1 100644
--- a/ets2panda/test/parser/ets/return-expected.txt
+++ b/ets2panda/test/parser/ets/return-expected.txt
@@ -324,35 +324,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -360,7 +332,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/scoped_decl-expected.txt b/ets2panda/test/parser/ets/scoped_decl-expected.txt
index eb61c9058d542f6aa38f5de3f66f37cb3e659585..38c30b0af70f757e349a281e0f3e5dfdfc8afd05 100644
--- a/ets2panda/test/parser/ets/scoped_decl-expected.txt
+++ b/ets2panda/test/parser/ets/scoped_decl-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt
index 4d08cca3d29655b7de2e89cc3a0049205591667d..1b8f4f84850f538bcfc9705f7695df68f87a2fb2 100644
--- a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt
index 4d08cca3d29655b7de2e89cc3a0049205591667d..1b8f4f84850f538bcfc9705f7695df68f87a2fb2 100644
--- a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt
index 4d08cca3d29655b7de2e89cc3a0049205591667d..1b8f4f84850f538bcfc9705f7695df68f87a2fb2 100644
--- a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt
index 271570dc9802aee53bd7a4605f440bc8ffec5fcd..4d69741abf88e3ab58aa9b9e9300d7c12ffcd8fc 100644
--- a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt
+++ b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt
@@ -219,43 +219,15 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 2
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
                       "column": 19
                     },
                     "end": {
-                      "line": 19,
-                      "column": 2
+                      "line": 18,
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/setter_native-expected.txt b/ets2panda/test/parser/ets/setter_native-expected.txt
index a36ac4231486e9f480afa0f14d6552268db17c58..10aa2e6d1847e31ad0cd111e1b078f97768665d8 100644
--- a/ets2panda/test/parser/ets/setter_native-expected.txt
+++ b/ets2panda/test/parser/ets/setter_native-expected.txt
@@ -159,35 +159,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 30
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 34
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 36
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -195,7 +167,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 36
+                      "column": 34
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/setter_with_non_void-expected.txt b/ets2panda/test/parser/ets/setter_with_non_void-expected.txt
index d346044787d7970a6dd03d7d99a5a386758f3fea..699eb1f4a7f2a907caa49c6edaece89f06739113 100644
--- a/ets2panda/test/parser/ets/setter_with_non_void-expected.txt
+++ b/ets2panda/test/parser/ets/setter_with_non_void-expected.txt
@@ -582,35 +582,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -618,7 +590,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/simple_types-expected.txt b/ets2panda/test/parser/ets/simple_types-expected.txt
index b75839eeb2747a4359414db7de8f4f03e8be5477..d6bf3fbed76c654c4eeb488f9e95497b28f13d9a 100644
--- a/ets2panda/test/parser/ets/simple_types-expected.txt
+++ b/ets2panda/test/parser/ets/simple_types-expected.txt
@@ -970,35 +970,7 @@
             "optional": false,
             "computed": false,
             "typeAnnotation": {
-              "type": "ETSTypeReference",
-              "part": {
-                "type": "ETSTypeReferencePart",
-                "name": {
-                  "type": "Identifier",
-                  "name": "void",
-                  "decorators": [],
-                  "loc": {
-                    "start": {
-                      "line": 24,
-                      "column": 8
-                    },
-                    "end": {
-                      "line": 24,
-                      "column": 12
-                    }
-                  }
-                },
-                "loc": {
-                  "start": {
-                    "line": 24,
-                    "column": 8
-                  },
-                  "end": {
-                    "line": 24,
-                    "column": 13
-                  }
-                }
-              },
+              "type": "ETSPrimitiveType",
               "loc": {
                 "start": {
                   "line": 24,
@@ -1006,7 +978,7 @@
                 },
                 "end": {
                   "line": 24,
-                  "column": 13
+                  "column": 12
                 }
               }
             },
@@ -1019,7 +991,7 @@
               },
               "end": {
                 "line": 24,
-                "column": 13
+                "column": 12
               }
             }
           },
diff --git a/ets2panda/test/parser/ets/static_function_hide_1-expected.txt b/ets2panda/test/parser/ets/static_function_hide_1-expected.txt
index 31301941e55845419624e2d22f12f98e4ae574c9..80a998c431a69dcc3cd3210316be9289b3eb2b22 100644
--- a/ets2panda/test/parser/ets/static_function_hide_1-expected.txt
+++ b/ets2panda/test/parser/ets/static_function_hide_1-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/static_function_hide_2-expected.txt b/ets2panda/test/parser/ets/static_function_hide_2-expected.txt
index f025fefb85e34ca329255e1e5c3da8f2782cc6ab..f17a09b279b410efb695fecbfd6bfa5cc02936db 100644
--- a/ets2panda/test/parser/ets/static_function_hide_2-expected.txt
+++ b/ets2panda/test/parser/ets/static_function_hide_2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 18
+                      "column": 16
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/static_function_hide_3-expected.txt b/ets2panda/test/parser/ets/static_function_hide_3-expected.txt
index 6cb06f2cb9eb27800444766f4879f5fdf2cefc93..b39086551270b91bc7096dba1bd9fe4238fa9252 100644
--- a/ets2panda/test/parser/ets/static_function_hide_3-expected.txt
+++ b/ets2panda/test/parser/ets/static_function_hide_3-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 18
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 18
+                      "column": 16
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/static_function_hide_4-expected.txt b/ets2panda/test/parser/ets/static_function_hide_4-expected.txt
index 9ce1e68329c377feb7f07c6421d16a04d41a0341..2055275ab06e04266170cf027a8a44890261b5f4 100644
--- a/ets2panda/test/parser/ets/static_function_hide_4-expected.txt
+++ b/ets2panda/test/parser/ets/static_function_hide_4-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 25
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 25
+                      "column": 23
                     }
                   }
                 },
@@ -380,35 +352,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 21
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 25
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 21
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 27
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -416,7 +360,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 27
+                      "column": 25
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt b/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt
index f796f0d37d5584c6399cc5e53c361d2b27c05e90..e127a150408f518ac4aad76f3cf27ec96c32e57c 100644
--- a/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt
+++ b/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt
@@ -68,35 +68,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 27
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 31
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 27
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 33
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -104,7 +76,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 33
+                      "column": 31
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/string_template-expected.txt b/ets2panda/test/parser/ets/string_template-expected.txt
index 3efbbd8bd5d247d4dae519d646af1dd440dfcdfe..eb424db468d2325a94c6a19a0238feef3c2c2d83 100644
--- a/ets2panda/test/parser/ets/string_template-expected.txt
+++ b/ets2panda/test/parser/ets/string_template-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/struct_templete-expected.txt b/ets2panda/test/parser/ets/struct_templete-expected.txt
index 5060c2b73b24c7c1345fe7a4e9af9b9775e6b4f7..387e53bcad0b25d125b9febc10fa90431d68e7b3 100644
--- a/ets2panda/test/parser/ets/struct_templete-expected.txt
+++ b/ets2panda/test/parser/ets/struct_templete-expected.txt
@@ -932,35 +932,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -968,7 +940,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/switch-expected.txt b/ets2panda/test/parser/ets/switch-expected.txt
index bf956fcd086802d94b8b28740a56183a281625f9..27e4e9a9bca9fa2050796a0d070c2924b0807117 100644
--- a/ets2panda/test/parser/ets/switch-expected.txt
+++ b/ets2panda/test/parser/ets/switch-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/switch2-expected.txt b/ets2panda/test/parser/ets/switch2-expected.txt
index 0f1939f693fbe2e2e122aadc5cc8d691f270d99d..26d29e343c68fe3ac5aa41654cda305bd8d9d5c2 100644
--- a/ets2panda/test/parser/ets/switch2-expected.txt
+++ b/ets2panda/test/parser/ets/switch2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/switch_enum-expected.txt b/ets2panda/test/parser/ets/switch_enum-expected.txt
index f4d9debe2d3c00c3b64e1134432875b7e5a97fe1..d2722c344cf98968dbbe0aca3c95e4b3aa14bc80 100644
--- a/ets2panda/test/parser/ets/switch_enum-expected.txt
+++ b/ets2panda/test/parser/ets/switch_enum-expected.txt
@@ -319,35 +319,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -355,7 +327,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/switch_enum2-expected.txt b/ets2panda/test/parser/ets/switch_enum2-expected.txt
index 59ed0f5ca2428204a9f25a66938e7acf8ff9599f..e54916e2ca8a27a51f7f0f74a379e1cd22974929 100644
--- a/ets2panda/test/parser/ets/switch_enum2-expected.txt
+++ b/ets2panda/test/parser/ets/switch_enum2-expected.txt
@@ -319,35 +319,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -355,7 +327,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/test_interface-expected.txt b/ets2panda/test/parser/ets/test_interface-expected.txt
index 176f14aabfb1fbbfdd08f56c0937d639961a40a0..fb162f263a41ef8df50bea83f4fcd58117074c8c 100644
--- a/ets2panda/test/parser/ets/test_interface-expected.txt
+++ b/ets2panda/test/parser/ets/test_interface-expected.txt
@@ -1030,35 +1030,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 16
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 12
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 17
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -1067,6 +1039,7 @@
                     "end": {
                       "line": 23,
                       "column": 17
+                      "column": 16
                     }
                   }
                 },
@@ -1078,7 +1051,7 @@
                   },
                   "end": {
                     "line": 23,
-                    "column": 17
+                    "column": 16
                   }
                 }
               },
@@ -1089,7 +1062,11 @@
                 },
                 "end": {
                   "line": 23,
+<<<<<<< HEAD
                   "column": 17
+=======
+                  "column": 16
+>>>>>>> Revert the implementation of the builtin void type
                 }
               }
             },
@@ -1182,35 +1159,7 @@
                       }
                     ],
                     "returnType": {
-                      "type": "ETSTypeReference",
-                      "part": {
-                        "type": "ETSTypeReferencePart",
-                        "name": {
-                          "type": "Identifier",
-                          "name": "void",
-                          "decorators": [],
-                          "loc": {
-                            "start": {
-                              "line": 26,
-                              "column": 31
-                            },
-                            "end": {
-                              "line": 26,
-                              "column": 35
-                            }
-                          }
-                        },
-                        "loc": {
-                          "start": {
-                            "line": 26,
-                            "column": 31
-                          },
-                          "end": {
-                            "line": 26,
-                            "column": 37
-                          }
-                        }
-                      },
+                      "type": "ETSPrimitiveType",
                       "loc": {
                         "start": {
                           "line": 26,
@@ -1218,7 +1167,7 @@
                         },
                         "end": {
                           "line": 26,
-                          "column": 37
+                          "column": 35
                         }
                       }
                     },
@@ -1373,35 +1322,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -1409,7 +1330,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt b/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt
index 193072b36e2c614584574cd63473689805ef2d1e..28dc200fff13d976dc01c81a3cf076d6064169f6 100644
--- a/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt
+++ b/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt b/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt
index 48beaae20046f197d069d27c4191e7823446fb00..652817c1c23f68e9a55cda39e884dc935c9ad4e5 100644
--- a/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt
+++ b/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt b/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt
index 286306f1acf387694d03b816e934ef4ad3cb60b2..a4259c59b656976cfeeab6f44eaaa36d3d25c659 100644
--- a/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt
+++ b/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/test_type_alias5-expected.txt b/ets2panda/test/parser/ets/test_type_alias5-expected.txt
index baa2505ed61aee127982ec98674abd5d11904a9c..03c3a6e07442c664001b8103762e4748a51d4c5c 100644
--- a/ets2panda/test/parser/ets/test_type_alias5-expected.txt
+++ b/ets2panda/test/parser/ets/test_type_alias5-expected.txt
@@ -1 +1,222 @@
-SyntaxError: Invalid Type [test_type_alias5.ets:16:10]
+{
+  "type": "Program",
+  "statements": [
+    {
+      "type": "TSTypeAliasDeclaration",
+      "id": {
+        "type": "Identifier",
+        "name": "x",
+        "decorators": [],
+        "loc": {
+          "start": {
+            "line": 16,
+            "column": 6
+          },
+          "end": {
+            "line": 16,
+            "column": 7
+          }
+        }
+      },
+      "typeAnnotation": {
+        "type": "ETSTypeReference",
+        "part": {
+          "type": "ETSTypeReferencePart",
+          "name": {
+            "type": "Identifier",
+            "name": "null",
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 16,
+                "column": 10
+              },
+              "end": {
+                "line": 16,
+                "column": 14
+              }
+            }
+          },
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          }
+        },
+        "loc": {
+          "start": {
+            "line": 16,
+            "column": 10
+          },
+          "end": {
+            "line": 16,
+            "column": 14
+          }
+        }
+      },
+      "loc": {
+        "start": {
+          "line": 16,
+          "column": 1
+        },
+        "end": {
+          "line": 16,
+          "column": 15
+        }
+      }
+    },
+    {
+      "type": "ClassDeclaration",
+      "definition": {
+        "id": {
+          "type": "Identifier",
+          "name": "ETSGLOBAL",
+          "decorators": [],
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          }
+        },
+        "superClass": null,
+        "implements": [],
+        "body": [
+          {
+            "type": "MethodDefinition",
+            "key": {
+              "type": "Identifier",
+              "name": "_$init$_",
+              "decorators": [],
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "kind": "method",
+            "accessibility": "public",
+            "static": true,
+            "optional": false,
+            "computed": false,
+            "value": {
+              "type": "FunctionExpression",
+              "function": {
+                "type": "ScriptFunction",
+                "id": {
+                  "type": "Identifier",
+                  "name": "_$init$_",
+                  "decorators": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "statements": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 1
+                  }
+                }
+              },
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "overloads": [],
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              }
+            }
+          }
+        ],
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 1
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        }
+      },
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 1
+        },
+        "end": {
+          "line": 1,
+          "column": 1
+        }
+      }
+    }
+  ],
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 1
+    },
+    "end": {
+      "line": 17,
+      "column": 1
+    }
+  }
+}
diff --git a/ets2panda/test/parser/ets/test_type_alias7-expected.txt b/ets2panda/test/parser/ets/test_type_alias7-expected.txt
index bb931f984e232e9849e0d18f1f384283fa0a2f4d..b2edf1cc7bc436ab048ded10c717da28c0f5f0d6 100644
--- a/ets2panda/test/parser/ets/test_type_alias7-expected.txt
+++ b/ets2panda/test/parser/ets/test_type_alias7-expected.txt
@@ -203,35 +203,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -239,7 +211,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/test_type_alias8-expected.txt b/ets2panda/test/parser/ets/test_type_alias8-expected.txt
index 58cd0b30d6898a4cced0b62019bd9396b9a071b0..b0985d5d7ab0bab95c8faf865331063244801d42 100644
--- a/ets2panda/test/parser/ets/test_type_alias8-expected.txt
+++ b/ets2panda/test/parser/ets/test_type_alias8-expected.txt
@@ -301,35 +301,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 32
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -337,7 +309,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 32
+                      "column": 30
                     }
                   }
                 },
@@ -506,35 +478,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 21,
-                          "column": 24
-                        },
-                        "end": {
-                          "line": 21,
-                          "column": 28
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 21,
-                        "column": 24
-                      },
-                      "end": {
-                        "line": 21,
-                        "column": 30
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 21,
@@ -542,7 +486,7 @@
                     },
                     "end": {
                       "line": 21,
-                      "column": 30
+                      "column": 28
                     }
                   }
                 },
@@ -641,35 +585,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 24,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 24,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 24,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 24,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 24,
@@ -677,7 +593,7 @@
                     },
                     "end": {
                       "line": 24,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt b/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt
index 203a0147ad78122484ca1943d0a1535679d7cac4..aabe3814f9b4c711e134ee0827673a4a0f7a6e39 100644
--- a/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt
+++ b/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt
@@ -375,35 +375,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 26
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 30
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 26
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -411,7 +383,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 37
+                      "column": 30
                     }
                   }
                 },
@@ -519,35 +491,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 33
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 37
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 33
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 44
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 20,
@@ -555,7 +499,7 @@
                             },
                             "end": {
                               "line": 20,
-                              "column": 44
+                              "column": 37
                             }
                           }
                         }
@@ -567,7 +511,7 @@
                           },
                           "end": {
                             "line": 20,
-                            "column": 44
+                            "column": 37
                           }
                         }
                       },
@@ -579,7 +523,7 @@
                         },
                         "end": {
                           "line": 20,
-                          "column": 44
+                          "column": 37
                         }
                       }
                     },
@@ -590,41 +534,13 @@
                       },
                       "end": {
                         "line": 20,
-                        "column": 44
+                        "column": 37
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 47
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 51
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 47
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 60
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -632,7 +548,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 60
+                      "column": 51
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt
index 00650102366ddafd3fbcbb152768c04ca362a8de..40eef6db2bb7925d65a28650bc461653601714d4 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 24
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 28
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 24
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 29
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 29
+                              "column": 28
                             }
                           }
                         },
@@ -217,7 +189,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 29
+                            "column": 28
                           }
                         }
                       },
@@ -229,7 +201,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 29
+                          "column": 28
                         }
                       }
                     },
@@ -240,41 +212,13 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 29
+                        "column": 28
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 31
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 35
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 31
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 37
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -282,7 +226,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 37
+                      "column": 35
                     }
                   }
                 },
@@ -425,35 +369,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -461,7 +377,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt
index fba13eb71c47ee15f33656c8ef2708ad9bd50150..b1d8cae01bf82b522e6e48bccf88c5681446cce6 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt
@@ -319,35 +319,7 @@
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 25
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 29
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 25
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 30
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -355,7 +327,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 30
+                              "column": 29
                             }
                           }
                         },
@@ -366,7 +338,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 30
+                            "column": 29
                           }
                         }
                       },
@@ -378,7 +350,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 30
+                          "column": 29
                         }
                       }
                     },
@@ -389,7 +361,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 30
+                        "column": 29
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt
index d28a8d4b7195a6d54994d0eb82c7fbc340a20654..f5296dca4c5f3ec8082d457cfc2e039c35e08bf9 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 19
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 23
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 19
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 24
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 24
+                              "column": 23
                             }
                           }
                         },
@@ -217,7 +189,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 24
+                            "column": 23
                           }
                         }
                       },
@@ -229,7 +201,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 24
+                          "column": 23
                         }
                       }
                     },
@@ -240,7 +212,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 24
+                        "column": 23
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt
index 2b121252b428b6b70cbf03a2ba149bd35548fb25..99138c53253803a16d822394afbfcdb1c3a3c5da 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt
@@ -260,35 +260,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 19
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 23
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 19
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 24
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -296,7 +268,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 24
+                              "column": 23
                             }
                           }
                         },
@@ -307,7 +279,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 24
+                            "column": 23
                           }
                         }
                       },
@@ -319,7 +291,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 24
+                          "column": 23
                         }
                       }
                     },
@@ -330,7 +302,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 24
+                        "column": 23
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt
index 338dae3eb5e2705f61d498db66137fad715262b7..5cf1da5e2164a2d91d56e81244a02364b5fd0af8 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 19
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 23
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 19
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 24
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 24
+                              "column": 23
                             }
                           }
                         },
@@ -217,7 +189,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 24
+                            "column": 23
                           }
                         }
                       },
@@ -229,7 +201,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 24
+                          "column": 23
                         }
                       }
                     },
@@ -240,7 +212,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 24
+                        "column": 23
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt
index 848c68a958e4d3861204f75568c7d16541d9ac91..7a026932905aa71b7e259f72974048b0bd5957d7 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 28
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 32
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 28
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 33
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 33
+                              "column": 32
                             }
                           }
                         },
@@ -123,7 +95,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 33
+                            "column": 32
                           }
                         }
                       },
@@ -135,7 +107,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 33
+                          "column": 32
                         }
                       }
                     },
@@ -146,7 +118,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 33
+                        "column": 32
                       }
                     }
                   }
@@ -384,35 +356,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -420,7 +364,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt
index 8b2aba34a54a9c65c9fd6385e86baf78f647d3cf..d531519af8ff8bb4374b50bcf85be0e18237f07a 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt
@@ -76,35 +76,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 17,
-                                  "column": 28
-                                },
-                                "end": {
-                                  "line": 17,
-                                  "column": 32
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 17,
-                                "column": 28
-                              },
-                              "end": {
-                                "line": 17,
-                                "column": 33
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 17,
@@ -112,7 +84,7 @@
                             },
                             "end": {
                               "line": 17,
-                              "column": 33
+                              "column": 32
                             }
                           }
                         },
@@ -123,7 +95,7 @@
                           },
                           "end": {
                             "line": 17,
-                            "column": 33
+                            "column": 32
                           }
                         }
                       },
@@ -135,7 +107,7 @@
                         },
                         "end": {
                           "line": 17,
-                          "column": 33
+                          "column": 32
                         }
                       }
                     },
@@ -146,7 +118,7 @@
                       },
                       "end": {
                         "line": 17,
-                        "column": 33
+                        "column": 32
                       }
                     }
                   }
@@ -384,35 +356,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -420,7 +364,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt
index efb009850fb956e5d279085c5a8dc7150f550c0d..477129e0c7629f7f6eefb49965412b1633bcb838 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt
@@ -211,35 +211,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 36
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 40
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 36
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 41
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -247,7 +219,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 41
+                              "column": 40
                             }
                           }
                         },
@@ -258,7 +230,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 41
+                            "column": 40
                           }
                         }
                       },
@@ -270,7 +242,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 41
+                          "column": 40
                         }
                       }
                     },
@@ -281,7 +253,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 41
+                        "column": 40
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt
index 207b01ff01719d04cf78b308cac09bd63421dc0b..d850e53e7a946c293fc73ec137b281a53f7c6a6c 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt
@@ -240,35 +240,7 @@
                           }
                         ],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 31
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 35
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 31
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 36
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -276,7 +248,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 36
+                              "column": 35
                             }
                           }
                         },
@@ -287,7 +259,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 36
+                            "column": 35
                           }
                         }
                       },
@@ -299,7 +271,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 36
+                          "column": 35
                         }
                       }
                     },
@@ -310,7 +282,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 36
+                        "column": 35
                       }
                     }
                   },
@@ -323,35 +295,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 45
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 49
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 45
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 50
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -359,7 +303,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 50
+                              "column": 49
                             }
                           }
                         },
@@ -370,7 +314,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 50
+                            "column": 49
                           }
                         }
                       },
@@ -382,7 +326,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 50
+                          "column": 49
                         }
                       }
                     },
@@ -393,7 +337,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 50
+                        "column": 49
                       }
                     }
                   }
@@ -531,35 +475,7 @@
                               }
                             ],
                             "returnType": {
-                              "type": "ETSTypeReference",
-                              "part": {
-                                "type": "ETSTypeReferencePart",
-                                "name": {
-                                  "type": "Identifier",
-                                  "name": "void",
-                                  "decorators": [],
-                                  "loc": {
-                                    "start": {
-                                      "line": 18,
-                                      "column": 28
-                                    },
-                                    "end": {
-                                      "line": 18,
-                                      "column": 32
-                                    }
-                                  }
-                                },
-                                "loc": {
-                                  "start": {
-                                    "line": 18,
-                                    "column": 28
-                                  },
-                                  "end": {
-                                    "line": 18,
-                                    "column": 33
-                                  }
-                                }
-                              },
+                              "type": "ETSPrimitiveType",
                               "loc": {
                                 "start": {
                                   "line": 18,
@@ -567,7 +483,7 @@
                                 },
                                 "end": {
                                   "line": 18,
-                                  "column": 33
+                                  "column": 32
                                 }
                               }
                             },
@@ -578,7 +494,7 @@
                               },
                               "end": {
                                 "line": 18,
-                                "column": 33
+                                "column": 32
                               }
                             }
                           },
@@ -590,7 +506,7 @@
                             },
                             "end": {
                               "line": 18,
-                              "column": 33
+                              "column": 32
                             }
                           }
                         },
@@ -601,7 +517,7 @@
                           },
                           "end": {
                             "line": 18,
-                            "column": 33
+                            "column": 32
                           }
                         }
                       }
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt
index 957c812c6ea0231d91cc2ea41f9038174af0e646..5996f3b112f5a67c830e765728bd2d2c4f8867cc 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 19
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 23
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 19
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 24
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 24
+                              "column": 23
                             }
                           }
                         },
@@ -217,7 +189,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 24
+                            "column": 23
                           }
                         }
                       },
@@ -229,7 +201,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 24
+                          "column": 23
                         }
                       }
                     },
@@ -240,7 +212,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 24
+                        "column": 23
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt
index 99714c860fc89a091a0798172a146d011881fc33..666f33da52401c76653d303a2aeb5411849a2ee5 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt
@@ -22,43 +22,15 @@
         "type": "ETSFunctionType",
         "params": [],
         "returnType": {
-          "type": "ETSTypeReference",
-          "part": {
-            "type": "ETSTypeReferencePart",
-            "name": {
-              "type": "Identifier",
-              "name": "void",
-              "decorators": [],
-              "loc": {
-                "start": {
-                  "line": 16,
-                  "column": 20
-                },
-                "end": {
-                  "line": 16,
-                  "column": 24
-                }
-              }
-            },
-            "loc": {
-              "start": {
-                "line": 16,
-                "column": 20
-              },
-              "end": {
-                "line": 18,
-                "column": 9
-              }
-            }
-          },
+          "type": "ETSPrimitiveType",
           "loc": {
             "start": {
               "line": 16,
               "column": 20
             },
             "end": {
-              "line": 18,
-              "column": 9
+              "line": 16,
+              "column": 24
             }
           }
         },
@@ -68,8 +40,8 @@
             "column": 14
           },
           "end": {
-            "line": 18,
-            "column": 9
+            "line": 16,
+            "column": 24
           }
         }
       },
@@ -315,35 +287,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -351,7 +295,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
@@ -494,35 +438,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -530,7 +446,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt
index 30bb12ad2edd3cb76a1992b5879bbd6f469beaa1..f02e6b5a18b52822efcc7d45a7864a4b535655c9 100644
--- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt
+++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt
@@ -170,35 +170,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 16,
-                                  "column": 21
-                                },
-                                "end": {
-                                  "line": 16,
-                                  "column": 25
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 16,
-                                "column": 21
-                              },
-                              "end": {
-                                "line": 16,
-                                "column": 32
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 16,
@@ -206,7 +178,7 @@
                             },
                             "end": {
                               "line": 16,
-                              "column": 32
+                              "column": 25
                             }
                           }
                         }
@@ -218,7 +190,7 @@
                           },
                           "end": {
                             "line": 16,
-                            "column": 32
+                            "column": 25
                           }
                         }
                       },
@@ -230,7 +202,7 @@
                         },
                         "end": {
                           "line": 16,
-                          "column": 32
+                          "column": 25
                         }
                       }
                     },
@@ -241,7 +213,7 @@
                       },
                       "end": {
                         "line": 16,
-                        "column": 32
+                        "column": 25
                       }
                     }
                   }
@@ -349,35 +321,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 19,
-                                  "column": 22
-                                },
-                                "end": {
-                                  "line": 19,
-                                  "column": 26
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 19,
-                                "column": 22
-                              },
-                              "end": {
-                                "line": 19,
-                                "column": 27
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 19,
@@ -385,7 +329,7 @@
                             },
                             "end": {
                               "line": 19,
-                              "column": 27
+                              "column": 26
                             }
                           }
                         },
@@ -396,7 +340,7 @@
                           },
                           "end": {
                             "line": 19,
-                            "column": 27
+                            "column": 26
                           }
                         }
                       },
@@ -408,7 +352,7 @@
                         },
                         "end": {
                           "line": 19,
-                          "column": 27
+                          "column": 26
                         }
                       }
                     },
@@ -419,7 +363,7 @@
                       },
                       "end": {
                         "line": 19,
-                        "column": 27
+                        "column": 26
                       }
                     }
                   }
diff --git a/ets2panda/test/parser/ets/type_variance1-expected.txt b/ets2panda/test/parser/ets/type_variance1-expected.txt
index 526d6a2a596d5a2f79c9d894f7dd105a53196202..a877e97aa772514766b897abda5855592291777b 100644
--- a/ets2panda/test/parser/ets/type_variance1-expected.txt
+++ b/ets2panda/test/parser/ets/type_variance1-expected.txt
@@ -182,35 +182,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 17,
-                          "column": 16
-                        },
-                        "end": {
-                          "line": 17,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 17,
-                        "column": 16
-                      },
-                      "end": {
-                        "line": 17,
-                        "column": 22
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 17,
@@ -218,7 +190,7 @@
                     },
                     "end": {
                       "line": 17,
-                      "column": 22
+                      "column": 20
                     }
                   }
                 },
@@ -508,35 +480,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 23,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 23,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 23,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 23,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 23,
@@ -544,7 +488,7 @@
                     },
                     "end": {
                       "line": 23,
-                      "column": 24
+                      "column": 23
                     }
                   }
                 },
@@ -556,7 +500,7 @@
                   },
                   "end": {
                     "line": 23,
-                    "column": 24
+                    "column": 23
                   }
                 }
               },
@@ -567,7 +511,7 @@
                 },
                 "end": {
                   "line": 23,
-                  "column": 24
+                  "column": 23
                 }
               }
             },
@@ -939,35 +883,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 28,
-                          "column": 19
-                        },
-                        "end": {
-                          "line": 28,
-                          "column": 23
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 28,
-                        "column": 19
-                      },
-                      "end": {
-                        "line": 28,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 28,
@@ -975,7 +891,7 @@
                     },
                     "end": {
                       "line": 28,
-                      "column": 24
+                      "column": 23
                     }
                   }
                 },
@@ -987,7 +903,7 @@
                   },
                   "end": {
                     "line": 28,
-                    "column": 24
+                    "column": 23
                   }
                 }
               },
@@ -998,7 +914,7 @@
                 },
                 "end": {
                   "line": 28,
-                  "column": 24
+                  "column": 23
                 }
               }
             },
@@ -1673,35 +1589,7 @@
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 35,
-                          "column": 25
-                        },
-                        "end": {
-                          "line": 35,
-                          "column": 29
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 35,
-                        "column": 25
-                      },
-                      "end": {
-                        "line": 35,
-                        "column": 31
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 35,
@@ -1709,7 +1597,7 @@
                     },
                     "end": {
                       "line": 35,
-                      "column": 31
+                      "column": 29
                     }
                   }
                 },
@@ -3300,35 +3188,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 57,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 57,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 57,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 57,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 57,
@@ -3336,7 +3196,7 @@
                     },
                     "end": {
                       "line": 57,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/undefinedNullNotObject-expected.txt b/ets2panda/test/parser/ets/undefinedNullNotObject-expected.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dae0a6c598ab324ff103570928b21a3e682bb77c
--- /dev/null
+++ b/ets2panda/test/parser/ets/undefinedNullNotObject-expected.txt
@@ -0,0 +1,432 @@
+{
+  "type": "Program",
+  "statements": [
+    {
+      "type": "ClassDeclaration",
+      "definition": {
+        "id": {
+          "type": "Identifier",
+          "name": "ETSGLOBAL",
+          "decorators": [],
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          }
+        },
+        "superClass": null,
+        "implements": [],
+        "body": [
+          {
+            "type": "MethodDefinition",
+            "key": {
+              "type": "Identifier",
+              "name": "_$init$_",
+              "decorators": [],
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "kind": "method",
+            "accessibility": "public",
+            "static": true,
+            "optional": false,
+            "computed": false,
+            "value": {
+              "type": "FunctionExpression",
+              "function": {
+                "type": "ScriptFunction",
+                "id": {
+                  "type": "Identifier",
+                  "name": "_$init$_",
+                  "decorators": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "statements": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 1
+                  }
+                }
+              },
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "overloads": [],
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              }
+            }
+          },
+          {
+            "type": "MethodDefinition",
+            "key": {
+              "type": "Identifier",
+              "name": "main",
+              "decorators": [],
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 10
+                },
+                "end": {
+                  "line": 16,
+                  "column": 14
+                }
+              }
+            },
+            "kind": "method",
+            "accessibility": "public",
+            "static": true,
+            "optional": false,
+            "computed": false,
+            "value": {
+              "type": "FunctionExpression",
+              "function": {
+                "type": "ScriptFunction",
+                "id": {
+                  "type": "Identifier",
+                  "name": "main",
+                  "decorators": [],
+                  "loc": {
+                    "start": {
+                      "line": 16,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 16,
+                      "column": 14
+                    }
+                  }
+                },
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "statements": [
+                    {
+                      "type": "VariableDeclaration",
+                      "declarations": [
+                        {
+                          "type": "VariableDeclarator",
+                          "id": {
+                            "type": "Identifier",
+                            "name": "mix",
+                            "typeAnnotation": {
+                              "type": "ETSTypeReference",
+                              "part": {
+                                "type": "ETSTypeReferencePart",
+                                "name": {
+                                  "type": "Identifier",
+                                  "name": "null",
+                                  "decorators": [],
+                                  "loc": {
+                                    "start": {
+                                      "line": 17,
+                                      "column": 27
+                                    },
+                                    "end": {
+                                      "line": 17,
+                                      "column": 31
+                                    }
+                                  }
+                                },
+                                "loc": {
+                                  "start": {
+                                    "line": 1,
+                                    "column": 1
+                                  },
+                                  "end": {
+                                    "line": 1,
+                                    "column": 1
+                                  }
+                                }
+                              },
+                              "loc": {
+                                "start": {
+                                  "line": 17,
+                                  "column": 27
+                                },
+                                "end": {
+                                  "line": 17,
+                                  "column": 31
+                                }
+                              }
+                            },
+                            "decorators": [],
+                            "loc": {
+                              "start": {
+                                "line": 17,
+                                "column": 9
+                              },
+                              "end": {
+                                "line": 17,
+                                "column": 12
+                              }
+                            }
+                          },
+                          "init": null,
+                          "loc": {
+                            "start": {
+                              "line": 17,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 17,
+                              "column": 12
+                            }
+                          }
+                        }
+                      ],
+                      "kind": "let",
+                      "loc": {
+                        "start": {
+                          "line": 17,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 17,
+                          "column": 32
+                        }
+                      }
+                    },
+                    {
+                      "type": "ExpressionStatement",
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "name": "mix",
+                          "decorators": [],
+                          "loc": {
+                            "start": {
+                              "line": 18,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 18,
+                              "column": 8
+                            }
+                          }
+                        },
+                        "right": {
+                          "type": "ETSNewClassInstanceExpression",
+                          "typeReference": {
+                            "type": "ETSTypeReference",
+                            "part": {
+                              "type": "ETSTypeReferencePart",
+                              "name": {
+                                "type": "Identifier",
+                                "name": "Object",
+                                "decorators": [],
+                                "loc": {
+                                  "start": {
+                                    "line": 18,
+                                    "column": 15
+                                  },
+                                  "end": {
+                                    "line": 18,
+                                    "column": 21
+                                  }
+                                }
+                              },
+                              "loc": {
+                                "start": {
+                                  "line": 18,
+                                  "column": 15
+                                },
+                                "end": {
+                                  "line": 18,
+                                  "column": 22
+                                }
+                              }
+                            },
+                            "loc": {
+                              "start": {
+                                "line": 18,
+                                "column": 15
+                              },
+                              "end": {
+                                "line": 18,
+                                "column": 22
+                              }
+                            }
+                          },
+                          "arguments": [],
+                          "loc": {
+                            "start": {
+                              "line": 18,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 18,
+                              "column": 24
+                            }
+                          }
+                        },
+                        "loc": {
+                          "start": {
+                            "line": 18,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 18,
+                            "column": 24
+                          }
+                        }
+                      },
+                      "loc": {
+                        "start": {
+                          "line": 18,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 18,
+                          "column": 24
+                        }
+                      }
+                    }
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 16,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 19,
+                      "column": 2
+                    }
+                  }
+                },
+                "loc": {
+                  "start": {
+                    "line": 16,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 19,
+                    "column": 2
+                  }
+                }
+              },
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 14
+                },
+                "end": {
+                  "line": 19,
+                  "column": 2
+                }
+              }
+            },
+            "overloads": [],
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 16,
+                "column": 1
+              },
+              "end": {
+                "line": 19,
+                "column": 2
+              }
+            }
+          }
+        ],
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 1
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        }
+      },
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 1
+        },
+        "end": {
+          "line": 1,
+          "column": 1
+        }
+      }
+    }
+  ],
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 1
+    },
+    "end": {
+      "line": 20,
+      "column": 1
+    }
+  }
+}
+TypeError: Type 'Object' cannot be assigned to type 'null' [undefinedNullNotObject.ets:18:11]
diff --git a/ets2panda/test/runtime/ets/voidInstanceReturn.ets b/ets2panda/test/parser/ets/undefinedNullNotObject.ets
similarity index 46%
rename from ets2panda/test/runtime/ets/voidInstanceReturn.ets
rename to ets2panda/test/parser/ets/undefinedNullNotObject.ets
index 31fdf13cfaae06c713be36a4e5ecc59326841ff1..02ba02c2a36d90ee99a86628f40cf64f70af35a6 100644
--- a/ets2panda/test/runtime/ets/voidInstanceReturn.ets
+++ b/ets2panda/test/parser/ets/undefinedNullNotObject.ets
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,41 +13,7 @@
  * limitations under the License.
  */
 
-let res: int
-type F = () => void;
-
-function bar() :void {
-    return;
-}
-
-function foo(f: F): void {
-    return Void;
-}
-
-function emptyfoo(): void {
-}
-
-function noreturnfoo(): void {
-    let a = 2;
-}
-
-function main(): int {
-
-    let instance = Void;
-    let static_field = void.void_instance;
-
-    let a = foo(bar);
-    let b = bar();
-    let c = console.print("");
-    let d = emptyfoo();
-    let e = noreturnfoo();
-
-    assert(instance === static_field);
-    assert(instance === a);
-    assert(instance === b);
-    assert(instance === c);
-    assert(instance === d);
-    assert(instance === e);
-
-    return 0;
+function main(){
+    let mix : undefined | null;
+    mix = new Object();
 }
diff --git a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt
new file mode 100644
index 0000000000000000000000000000000000000000..452189063c9203f1f63d868884687548a1647274
--- /dev/null
+++ b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt
@@ -0,0 +1,543 @@
+{
+  "type": "Program",
+  "statements": [
+    {
+      "type": "ClassDeclaration",
+      "definition": {
+        "id": {
+          "type": "Identifier",
+          "name": "ETSGLOBAL",
+          "decorators": [],
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          }
+        },
+        "superClass": null,
+        "implements": [],
+        "body": [
+          {
+            "type": "MethodDefinition",
+            "key": {
+              "type": "Identifier",
+              "name": "_$init$_",
+              "decorators": [],
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "kind": "method",
+            "accessibility": "public",
+            "static": true,
+            "optional": false,
+            "computed": false,
+            "value": {
+              "type": "FunctionExpression",
+              "function": {
+                "type": "ScriptFunction",
+                "id": {
+                  "type": "Identifier",
+                  "name": "_$init$_",
+                  "decorators": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "statements": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 1
+                  }
+                }
+              },
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "overloads": [],
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              }
+            }
+          },
+          {
+            "type": "MethodDefinition",
+            "key": {
+              "type": "Identifier",
+              "name": "main",
+              "decorators": [],
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 10
+                },
+                "end": {
+                  "line": 16,
+                  "column": 14
+                }
+              }
+            },
+            "kind": "method",
+            "accessibility": "public",
+            "static": true,
+            "optional": false,
+            "computed": false,
+            "value": {
+              "type": "FunctionExpression",
+              "function": {
+                "type": "ScriptFunction",
+                "id": {
+                  "type": "Identifier",
+                  "name": "main",
+                  "decorators": [],
+                  "loc": {
+                    "start": {
+                      "line": 16,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 16,
+                      "column": 14
+                    }
+                  }
+                },
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "statements": [
+                    {
+                      "type": "VariableDeclaration",
+                      "declarations": [
+                        {
+                          "type": "VariableDeclarator",
+                          "id": {
+                            "type": "Identifier",
+                            "name": "mix",
+                            "typeAnnotation": {
+                              "type": "ETSTypeReference",
+                              "part": {
+                                "type": "ETSTypeReferencePart",
+                                "name": {
+                                  "type": "Identifier",
+                                  "name": "Object",
+                                  "decorators": [],
+                                  "loc": {
+                                    "start": {
+                                      "line": 17,
+                                      "column": 34
+                                    },
+                                    "end": {
+                                      "line": 17,
+                                      "column": 40
+                                    }
+                                  }
+                                },
+                                "loc": {
+                                  "start": {
+                                    "line": 17,
+                                    "column": 34
+                                  },
+                                  "end": {
+                                    "line": 17,
+                                    "column": 41
+                                  }
+                                }
+                              },
+                              "loc": {
+                                "start": {
+                                  "line": 17,
+                                  "column": 34
+                                },
+                                "end": {
+                                  "line": 17,
+                                  "column": 41
+                                }
+                              }
+                            },
+                            "decorators": [],
+                            "loc": {
+                              "start": {
+                                "line": 17,
+                                "column": 9
+                              },
+                              "end": {
+                                "line": 17,
+                                "column": 12
+                              }
+                            }
+                          },
+                          "init": null,
+                          "loc": {
+                            "start": {
+                              "line": 17,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 17,
+                              "column": 12
+                            }
+                          }
+                        }
+                      ],
+                      "kind": "let",
+                      "loc": {
+                        "start": {
+                          "line": 17,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 17,
+                          "column": 41
+                        }
+                      }
+                    },
+                    {
+                      "type": "ExpressionStatement",
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "name": "mix",
+                          "decorators": [],
+                          "loc": {
+                            "start": {
+                              "line": 18,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 18,
+                              "column": 8
+                            }
+                          }
+                        },
+                        "right": {
+                          "type": "UndefinedLiteral",
+                          "value": undefined,
+                          "loc": {
+                            "start": {
+                              "line": 18,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 18,
+                              "column": 20
+                            }
+                          }
+                        },
+                        "loc": {
+                          "start": {
+                            "line": 18,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 18,
+                            "column": 20
+                          }
+                        }
+                      },
+                      "loc": {
+                        "start": {
+                          "line": 18,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 18,
+                          "column": 21
+                        }
+                      }
+                    },
+                    {
+                      "type": "ExpressionStatement",
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "name": "mix",
+                          "decorators": [],
+                          "loc": {
+                            "start": {
+                              "line": 19,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 19,
+                              "column": 8
+                            }
+                          }
+                        },
+                        "right": {
+                          "type": "NullLiteral",
+                          "value": null,
+                          "loc": {
+                            "start": {
+                              "line": 19,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 19,
+                              "column": 15
+                            }
+                          }
+                        },
+                        "loc": {
+                          "start": {
+                            "line": 19,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 19,
+                            "column": 15
+                          }
+                        }
+                      },
+                      "loc": {
+                        "start": {
+                          "line": 19,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 19,
+                          "column": 16
+                        }
+                      }
+                    },
+                    {
+                      "type": "ExpressionStatement",
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "name": "mix",
+                          "decorators": [],
+                          "loc": {
+                            "start": {
+                              "line": 20,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 20,
+                              "column": 8
+                            }
+                          }
+                        },
+                        "right": {
+                          "type": "ETSNewClassInstanceExpression",
+                          "typeReference": {
+                            "type": "ETSTypeReference",
+                            "part": {
+                              "type": "ETSTypeReferencePart",
+                              "name": {
+                                "type": "Identifier",
+                                "name": "Object",
+                                "decorators": [],
+                                "loc": {
+                                  "start": {
+                                    "line": 20,
+                                    "column": 15
+                                  },
+                                  "end": {
+                                    "line": 20,
+                                    "column": 21
+                                  }
+                                }
+                              },
+                              "loc": {
+                                "start": {
+                                  "line": 20,
+                                  "column": 15
+                                },
+                                "end": {
+                                  "line": 20,
+                                  "column": 22
+                                }
+                              }
+                            },
+                            "loc": {
+                              "start": {
+                                "line": 20,
+                                "column": 15
+                              },
+                              "end": {
+                                "line": 20,
+                                "column": 22
+                              }
+                            }
+                          },
+                          "arguments": [],
+                          "loc": {
+                            "start": {
+                              "line": 20,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 20,
+                              "column": 24
+                            }
+                          }
+                        },
+                        "loc": {
+                          "start": {
+                            "line": 20,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 20,
+                            "column": 24
+                          }
+                        }
+                      },
+                      "loc": {
+                        "start": {
+                          "line": 20,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 20,
+                          "column": 24
+                        }
+                      }
+                    }
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 16,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 21,
+                      "column": 2
+                    }
+                  }
+                },
+                "loc": {
+                  "start": {
+                    "line": 16,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 21,
+                    "column": 2
+                  }
+                }
+              },
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 14
+                },
+                "end": {
+                  "line": 21,
+                  "column": 2
+                }
+              }
+            },
+            "overloads": [],
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 16,
+                "column": 1
+              },
+              "end": {
+                "line": 21,
+                "column": 2
+              }
+            }
+          }
+        ],
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 1
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        }
+      },
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 1
+        },
+        "end": {
+          "line": 1,
+          "column": 1
+        }
+      }
+    }
+  ],
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 1
+    },
+    "end": {
+      "line": 22,
+      "column": 1
+    }
+  }
+}
diff --git a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation.ets b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation.ets
new file mode 100644
index 0000000000000000000000000000000000000000..8d370cc35e9001a81a69bcb36cae9554af2e2b68
--- /dev/null
+++ b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation.ets
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function main(){
+    let mix : undefined | null | Object;
+    mix = undefined;
+    mix = null;
+    mix = new Object();
+}
diff --git a/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c1e0d86116aa75aef2f1261731be92ea2315f725
--- /dev/null
+++ b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt
@@ -0,0 +1,532 @@
+{
+  "type": "Program",
+  "statements": [
+    {
+      "type": "ClassDeclaration",
+      "definition": {
+        "id": {
+          "type": "Identifier",
+          "name": "ETSGLOBAL",
+          "decorators": [],
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          }
+        },
+        "superClass": null,
+        "implements": [],
+        "body": [
+          {
+            "type": "MethodDefinition",
+            "key": {
+              "type": "Identifier",
+              "name": "_$init$_",
+              "decorators": [],
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "kind": "method",
+            "accessibility": "public",
+            "static": true,
+            "optional": false,
+            "computed": false,
+            "value": {
+              "type": "FunctionExpression",
+              "function": {
+                "type": "ScriptFunction",
+                "id": {
+                  "type": "Identifier",
+                  "name": "_$init$_",
+                  "decorators": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "statements": [],
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 1
+                    }
+                  }
+                },
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 1
+                  }
+                }
+              },
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                }
+              }
+            },
+            "overloads": [],
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              }
+            }
+          },
+          {
+            "type": "MethodDefinition",
+            "key": {
+              "type": "Identifier",
+              "name": "main",
+              "decorators": [],
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 10
+                },
+                "end": {
+                  "line": 16,
+                  "column": 14
+                }
+              }
+            },
+            "kind": "method",
+            "accessibility": "public",
+            "static": true,
+            "optional": false,
+            "computed": false,
+            "value": {
+              "type": "FunctionExpression",
+              "function": {
+                "type": "ScriptFunction",
+                "id": {
+                  "type": "Identifier",
+                  "name": "main",
+                  "decorators": [],
+                  "loc": {
+                    "start": {
+                      "line": 16,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 16,
+                      "column": 14
+                    }
+                  }
+                },
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "statements": [
+                    {
+                      "type": "VariableDeclaration",
+                      "declarations": [
+                        {
+                          "type": "VariableDeclarator",
+                          "id": {
+                            "type": "Identifier",
+                            "name": "und",
+                            "typeAnnotation": {
+                              "type": "ETSTypeReference",
+                              "part": {
+                                "type": "ETSTypeReferencePart",
+                                "name": {
+                                  "type": "Identifier",
+                                  "name": "undefined",
+                                  "decorators": [],
+                                  "loc": {
+                                    "start": {
+                                      "line": 17,
+                                      "column": 15
+                                    },
+                                    "end": {
+                                      "line": 17,
+                                      "column": 24
+                                    }
+                                  }
+                                },
+                                "loc": {
+                                  "start": {
+                                    "line": 1,
+                                    "column": 1
+                                  },
+                                  "end": {
+                                    "line": 1,
+                                    "column": 1
+                                  }
+                                }
+                              },
+                              "loc": {
+                                "start": {
+                                  "line": 17,
+                                  "column": 15
+                                },
+                                "end": {
+                                  "line": 17,
+                                  "column": 24
+                                }
+                              }
+                            },
+                            "decorators": [],
+                            "loc": {
+                              "start": {
+                                "line": 17,
+                                "column": 9
+                              },
+                              "end": {
+                                "line": 17,
+                                "column": 12
+                              }
+                            }
+                          },
+                          "init": null,
+                          "loc": {
+                            "start": {
+                              "line": 17,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 17,
+                              "column": 12
+                            }
+                          }
+                        }
+                      ],
+                      "kind": "let",
+                      "loc": {
+                        "start": {
+                          "line": 17,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 17,
+                          "column": 25
+                        }
+                      }
+                    },
+                    {
+                      "type": "VariableDeclaration",
+                      "declarations": [
+                        {
+                          "type": "VariableDeclarator",
+                          "id": {
+                            "type": "Identifier",
+                            "name": "nul",
+                            "typeAnnotation": {
+                              "type": "ETSTypeReference",
+                              "part": {
+                                "type": "ETSTypeReferencePart",
+                                "name": {
+                                  "type": "Identifier",
+                                  "name": "null",
+                                  "decorators": [],
+                                  "loc": {
+                                    "start": {
+                                      "line": 18,
+                                      "column": 15
+                                    },
+                                    "end": {
+                                      "line": 18,
+                                      "column": 19
+                                    }
+                                  }
+                                },
+                                "loc": {
+                                  "start": {
+                                    "line": 1,
+                                    "column": 1
+                                  },
+                                  "end": {
+                                    "line": 1,
+                                    "column": 1
+                                  }
+                                }
+                              },
+                              "loc": {
+                                "start": {
+                                  "line": 18,
+                                  "column": 15
+                                },
+                                "end": {
+                                  "line": 18,
+                                  "column": 19
+                                }
+                              }
+                            },
+                            "decorators": [],
+                            "loc": {
+                              "start": {
+                                "line": 18,
+                                "column": 9
+                              },
+                              "end": {
+                                "line": 18,
+                                "column": 12
+                              }
+                            }
+                          },
+                          "init": null,
+                          "loc": {
+                            "start": {
+                              "line": 18,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 18,
+                              "column": 12
+                            }
+                          }
+                        }
+                      ],
+                      "kind": "let",
+                      "loc": {
+                        "start": {
+                          "line": 18,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 18,
+                          "column": 20
+                        }
+                      }
+                    },
+                    {
+                      "type": "ExpressionStatement",
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "name": "und",
+                          "decorators": [],
+                          "loc": {
+                            "start": {
+                              "line": 19,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 19,
+                              "column": 8
+                            }
+                          }
+                        },
+                        "right": {
+                          "type": "UndefinedLiteral",
+                          "value": undefined,
+                          "loc": {
+                            "start": {
+                              "line": 19,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 19,
+                              "column": 20
+                            }
+                          }
+                        },
+                        "loc": {
+                          "start": {
+                            "line": 19,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 19,
+                            "column": 20
+                          }
+                        }
+                      },
+                      "loc": {
+                        "start": {
+                          "line": 19,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 19,
+                          "column": 21
+                        }
+                      }
+                    },
+                    {
+                      "type": "ExpressionStatement",
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "name": "nul",
+                          "decorators": [],
+                          "loc": {
+                            "start": {
+                              "line": 20,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 20,
+                              "column": 8
+                            }
+                          }
+                        },
+                        "right": {
+                          "type": "NullLiteral",
+                          "value": null,
+                          "loc": {
+                            "start": {
+                              "line": 20,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 20,
+                              "column": 15
+                            }
+                          }
+                        },
+                        "loc": {
+                          "start": {
+                            "line": 20,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 20,
+                            "column": 15
+                          }
+                        }
+                      },
+                      "loc": {
+                        "start": {
+                          "line": 20,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 20,
+                          "column": 16
+                        }
+                      }
+                    }
+                  ],
+                  "loc": {
+                    "start": {
+                      "line": 16,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 21,
+                      "column": 2
+                    }
+                  }
+                },
+                "loc": {
+                  "start": {
+                    "line": 16,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 21,
+                    "column": 2
+                  }
+                }
+              },
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 14
+                },
+                "end": {
+                  "line": 21,
+                  "column": 2
+                }
+              }
+            },
+            "overloads": [],
+            "decorators": [],
+            "loc": {
+              "start": {
+                "line": 16,
+                "column": 1
+              },
+              "end": {
+                "line": 21,
+                "column": 2
+              }
+            }
+          }
+        ],
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 1
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        }
+      },
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 1
+        },
+        "end": {
+          "line": 1,
+          "column": 1
+        }
+      }
+    }
+  ],
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 1
+    },
+    "end": {
+      "line": 22,
+      "column": 1
+    }
+  }
+}
diff --git a/ets2panda/test/parser/ets/undefinedNullTypeAlias.ets b/ets2panda/test/parser/ets/undefinedNullTypeAlias.ets
new file mode 100644
index 0000000000000000000000000000000000000000..c76d66a066016b3639d31185bf40ef92b3587872
--- /dev/null
+++ b/ets2panda/test/parser/ets/undefinedNullTypeAlias.ets
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function main(){
+    let und : undefined;
+    let nul : null;    
+    und = undefined;
+    nul = null;
+}
diff --git a/ets2panda/test/parser/ets/var_declare-expected.txt b/ets2panda/test/parser/ets/var_declare-expected.txt
index 24fa8c76393fe08b1e068b752f477a5e8ef97cbf..ad98c3727f6e9901bde87bad67ab132d846313d0 100644
--- a/ets2panda/test/parser/ets/var_declare-expected.txt
+++ b/ets2panda/test/parser/ets/var_declare-expected.txt
@@ -208,35 +208,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 19,
-                          "column": 20
-                        },
-                        "end": {
-                          "line": 19,
-                          "column": 24
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 19,
-                        "column": 20
-                      },
-                      "end": {
-                        "line": 19,
-                        "column": 26
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 19,
@@ -244,7 +216,7 @@
                     },
                     "end": {
                       "line": 19,
-                      "column": 26
+                      "column": 24
                     }
                   }
                 },
diff --git a/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt b/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt
index cab900f77a29de6f99a464d67df9a305e22a65b0..604de34c49ef4b95941e0a250f9067f1f1a87cd2 100644
--- a/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt
+++ b/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -297,35 +269,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -333,7 +277,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 29
+                      "column": 22
                     }
                   }
                 },
@@ -441,35 +385,7 @@
                         "type": "ETSFunctionType",
                         "params": [],
                         "returnType": {
-                          "type": "ETSTypeReference",
-                          "part": {
-                            "type": "ETSTypeReferencePart",
-                            "name": {
-                              "type": "Identifier",
-                              "name": "void",
-                              "decorators": [],
-                              "loc": {
-                                "start": {
-                                  "line": 20,
-                                  "column": 23
-                                },
-                                "end": {
-                                  "line": 20,
-                                  "column": 27
-                                }
-                              }
-                            },
-                            "loc": {
-                              "start": {
-                                "line": 20,
-                                "column": 23
-                              },
-                              "end": {
-                                "line": 20,
-                                "column": 34
-                              }
-                            }
-                          },
+                          "type": "ETSPrimitiveType",
                           "loc": {
                             "start": {
                               "line": 20,
@@ -477,7 +393,7 @@
                             },
                             "end": {
                               "line": 20,
-                              "column": 34
+                              "column": 27
                             }
                           }
                         }
@@ -489,7 +405,7 @@
                           },
                           "end": {
                             "line": 20,
-                            "column": 34
+                            "column": 27
                           }
                         }
                       },
@@ -501,7 +417,7 @@
                         },
                         "end": {
                           "line": 20,
-                          "column": 34
+                          "column": 27
                         }
                       }
                     },
@@ -512,41 +428,13 @@
                       },
                       "end": {
                         "line": 20,
-                        "column": 34
+                        "column": 27
                       }
                     }
                   }
                 ],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 20,
-                          "column": 38
-                        },
-                        "end": {
-                          "line": 20,
-                          "column": 42
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 20,
-                        "column": 38
-                      },
-                      "end": {
-                        "line": 20,
-                        "column": 51
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 20,
@@ -554,7 +442,7 @@
                     },
                     "end": {
                       "line": 20,
-                      "column": 51
+                      "column": 42
                     }
                   }
                 },
@@ -654,35 +542,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 22,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 22,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 22,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 22,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 22,
@@ -690,7 +550,7 @@
                     },
                     "end": {
                       "line": 22,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -709,35 +569,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 23,
-                                        "column": 26
-                                      },
-                                      "end": {
-                                        "line": 23,
-                                        "column": 30
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 23,
-                                      "column": 26
-                                    },
-                                    "end": {
-                                      "line": 23,
-                                      "column": 37
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 23,
@@ -745,7 +577,7 @@
                                   },
                                   "end": {
                                     "line": 23,
-                                    "column": 37
+                                    "column": 30
                                   }
                                 }
                               }
@@ -757,7 +589,7 @@
                                 },
                                 "end": {
                                   "line": 23,
-                                  "column": 37
+                                  "column": 30
                                 }
                               }
                             },
@@ -824,35 +656,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 25,
-                                        "column": 26
-                                      },
-                                      "end": {
-                                        "line": 25,
-                                        "column": 30
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 25,
-                                      "column": 26
-                                    },
-                                    "end": {
-                                      "line": 25,
-                                      "column": 37
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 25,
@@ -860,7 +664,7 @@
                                   },
                                   "end": {
                                     "line": 25,
-                                    "column": 37
+                                    "column": 30
                                   }
                                 }
                               }
@@ -872,7 +676,7 @@
                                 },
                                 "end": {
                                   "line": 25,
-                                  "column": 37
+                                  "column": 30
                                 }
                               }
                             },
@@ -947,35 +751,7 @@
                                       "type": "ETSFunctionType",
                                       "params": [],
                                       "returnType": {
-                                        "type": "ETSTypeReference",
-                                        "part": {
-                                          "type": "ETSTypeReferencePart",
-                                          "name": {
-                                            "type": "Identifier",
-                                            "name": "void",
-                                            "decorators": [],
-                                            "loc": {
-                                              "start": {
-                                                "line": 27,
-                                                "column": 30
-                                              },
-                                              "end": {
-                                                "line": 27,
-                                                "column": 34
-                                              }
-                                            }
-                                          },
-                                          "loc": {
-                                            "start": {
-                                              "line": 27,
-                                              "column": 30
-                                            },
-                                            "end": {
-                                              "line": 27,
-                                              "column": 41
-                                            }
-                                          }
-                                        },
+                                        "type": "ETSPrimitiveType",
                                         "loc": {
                                           "start": {
                                             "line": 27,
@@ -983,7 +759,7 @@
                                           },
                                           "end": {
                                             "line": 27,
-                                            "column": 41
+                                            "column": 34
                                           }
                                         }
                                       }
@@ -995,7 +771,7 @@
                                         },
                                         "end": {
                                           "line": 27,
-                                          "column": 41
+                                          "column": 34
                                         }
                                       }
                                     },
@@ -1007,7 +783,7 @@
                                       },
                                       "end": {
                                         "line": 27,
-                                        "column": 41
+                                        "column": 34
                                       }
                                     }
                                   },
@@ -1018,41 +794,13 @@
                                     },
                                     "end": {
                                       "line": 27,
-                                      "column": 41
+                                      "column": 34
                                     }
                                   }
                                 }
                               ],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 27,
-                                        "column": 46
-                                      },
-                                      "end": {
-                                        "line": 27,
-                                        "column": 50
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 27,
-                                      "column": 46
-                                    },
-                                    "end": {
-                                      "line": 27,
-                                      "column": 57
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 27,
@@ -1060,7 +808,7 @@
                                   },
                                   "end": {
                                     "line": 27,
-                                    "column": 57
+                                    "column": 50
                                   }
                                 }
                               }
@@ -1072,7 +820,7 @@
                                 },
                                 "end": {
                                   "line": 27,
-                                  "column": 57
+                                  "column": 50
                                 }
                               }
                             },
diff --git a/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt b/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt
index a0cc39d9676735ecc6c10086ab255d2db4927e94..ab6aff19a716893c331304f6596fbb8dafd3c378 100644
--- a/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt
+++ b/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 29
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 29
+                      "column": 22
                     }
                   }
                 },
@@ -298,35 +270,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 18,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 18,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 18,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 18,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 18,
@@ -334,7 +278,7 @@
                     },
                     "end": {
                       "line": 18,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
@@ -353,35 +297,7 @@
                               "type": "ETSFunctionType",
                               "params": [],
                               "returnType": {
-                                "type": "ETSTypeReference",
-                                "part": {
-                                  "type": "ETSTypeReferencePart",
-                                  "name": {
-                                    "type": "Identifier",
-                                    "name": "void",
-                                    "decorators": [],
-                                    "loc": {
-                                      "start": {
-                                        "line": 19,
-                                        "column": 29
-                                      },
-                                      "end": {
-                                        "line": 19,
-                                        "column": 33
-                                      }
-                                    }
-                                  },
-                                  "loc": {
-                                    "start": {
-                                      "line": 19,
-                                      "column": 29
-                                    },
-                                    "end": {
-                                      "line": 19,
-                                      "column": 35
-                                    }
-                                  }
-                                },
+                                "type": "ETSPrimitiveType",
                                 "loc": {
                                   "start": {
                                     "line": 19,
@@ -389,7 +305,7 @@
                                   },
                                   "end": {
                                     "line": 19,
-                                    "column": 35
+                                    "column": 33
                                   }
                                 }
                               },
@@ -400,7 +316,7 @@
                                 },
                                 "end": {
                                   "line": 19,
-                                  "column": 35
+                                  "column": 33
                                 }
                               }
                             },
diff --git a/ets2panda/test/parser/ets/void-expected.txt b/ets2panda/test/parser/ets/void-expected.txt
index f50e36f037eb4e39c0f0bc9accd409bafbcb352c..8f4c35becc0b1049c721d4411e86fee122f2f976 100644
--- a/ets2panda/test/parser/ets/void-expected.txt
+++ b/ets2panda/test/parser/ets/void-expected.txt
@@ -162,35 +162,7 @@
                 "expression": false,
                 "params": [],
                 "returnType": {
-                  "type": "ETSTypeReference",
-                  "part": {
-                    "type": "ETSTypeReferencePart",
-                    "name": {
-                      "type": "Identifier",
-                      "name": "void",
-                      "decorators": [],
-                      "loc": {
-                        "start": {
-                          "line": 16,
-                          "column": 18
-                        },
-                        "end": {
-                          "line": 16,
-                          "column": 22
-                        }
-                      }
-                    },
-                    "loc": {
-                      "start": {
-                        "line": 16,
-                        "column": 18
-                      },
-                      "end": {
-                        "line": 16,
-                        "column": 24
-                      }
-                    }
-                  },
+                  "type": "ETSPrimitiveType",
                   "loc": {
                     "start": {
                       "line": 16,
@@ -198,7 +170,7 @@
                     },
                     "end": {
                       "line": 16,
-                      "column": 24
+                      "column": 22
                     }
                   }
                 },
diff --git a/ets2panda/test/test-lists/parser/parser-js-ignored.txt b/ets2panda/test/test-lists/parser/parser-js-ignored.txt
index a0cac35d0e8d349ebf833c8793d6cfe4aae7a44a..80046b8af4ec51a89cfa962dd5a0158ce737e4bd 100644
--- a/ets2panda/test/test-lists/parser/parser-js-ignored.txt
+++ b/ets2panda/test/test-lists/parser/parser-js-ignored.txt
@@ -78,3 +78,7 @@ parser/ets/static_function_hide_2.ets
 
 # 14595
 compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable.ets
+
+# Related to void revert
+compiler/ets/lambda_infer_type/lambda_cast_infer_type_void.ets
+compiler/ets/promiseVoid.ets
diff --git a/ets2panda/varbinder/ETSBinder.cpp b/ets2panda/varbinder/ETSBinder.cpp
index f54c6943f72428a63285292df206cf63d852d2c5..74a0fa129d712692d35da6bef3d5959ee1cb7991 100644
--- a/ets2panda/varbinder/ETSBinder.cpp
+++ b/ets2panda/varbinder/ETSBinder.cpp
@@ -94,6 +94,9 @@ void ETSBinder::LookupTypeArgumentReferences(ir::ETSTypeReference *typeRef)
 void ETSBinder::LookupTypeReference(ir::Identifier *ident, bool allowDynamicNamespaces)
 {
     const auto &name = ident->Name();
+    if (name == compiler::Signatures::UNDEFINED || name == compiler::Signatures::NULL_LITERAL) {
+        return;
+    }
     auto *iter = GetScope();
 
     while (iter != nullptr) {