mini refactoring
rename primitive types
various updates