ALH: Rename files
ALH: Refactor naming convention