Revamp naming section, resolving many of the open naming questions