Enforce some sanity and cleaner names