made some changes to the naming