Rename types for convenient use
Remove unnecessary overloads