Refactor

Rename data types