Remove Aedile:: prefixes