A bit of switcharoo on names and stuff