Careful naming things part deux