Minor naming/style tweaks