updated naming conventions for individual pieces