Refactor the naming convention for the AR objects