Naming/style tweaks.