fixing the naming