Refactor the naming part to make it more consistent