naming convention tweaks