Naming convention updates

Applied to all 3 sub-projects