Rename fix

- rename files and aliases