Short fix of refactored namings