be more consistent on the naming