Minor schema changes to shorten rolenames