Refactor - rename to respect the naming convention