Updating naming with PROJECT for easy find and replace