Error handling
Remove aliases
Rename