Checking in some changes for naming