[feature/alias-fix] conform to the style guide