More explicit and consistent part names