diff --git a/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/types/PackageProvider.kt b/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/types/PackageProvider.kt
index faada4a4e..93a6a5854 100644
--- a/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/types/PackageProvider.kt
+++ b/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/types/PackageProvider.kt
@@ -2,7 +2,6 @@ package io.vrap.rmf.codegen.types
 
 import com.google.inject.Inject
 import com.google.inject.name.Named
-import io.vrap.rmf.codegen.di.VrapConstants
 import io.vrap.rmf.raml.model.modules.Library
 import io.vrap.rmf.raml.model.resources.Method
 import io.vrap.rmf.raml.model.resources.Resource
@@ -67,11 +66,11 @@ class PackageProvider @Inject constructor(
 
     private inner class ResourcePackageSwitch : ResourcesSwitch<String>() {
         override fun caseMethod(`object`: Method): String {
-            return "$clientPackage.resource"
+            return "$clientPackage"
         }
 
         override fun caseResource(`object`: Resource?): String {
-            return "$clientPackage.resource"
+            return "$clientPackage"
         }
 
         override fun defaultCase(`object`: EObject): String {
diff --git a/codegen-renderers/src/main/kotlin/io/vrap/codegen/languages/typescript/model/TypeScriptBaseTypes.kt b/codegen-renderers/src/main/kotlin/io/vrap/codegen/languages/typescript/model/TypeScriptBaseTypes.kt
index 854a3b0ba..ba0f5563f 100644
--- a/codegen-renderers/src/main/kotlin/io/vrap/codegen/languages/typescript/model/TypeScriptBaseTypes.kt
+++ b/codegen-renderers/src/main/kotlin/io/vrap/codegen/languages/typescript/model/TypeScriptBaseTypes.kt
@@ -10,8 +10,8 @@ object TypeScriptBaseTypes : LanguageBaseTypes(
     doubleType = nativeTypeScriptType("number"),
     stringType = nativeTypeScriptType("string"),
     booleanType = nativeTypeScriptType("boolean"),
-    dateTimeType = nativeTypeScriptType("string"),
-    dateOnlyType = nativeTypeScriptType("string"),
+    dateTimeType = nativeTypeScriptType("Date"),
+    dateOnlyType = nativeTypeScriptType("Date"),
     timeOnlyType = nativeTypeScriptType("string")
 )