Alright, went ahead and changed the names up for them. Hopefully this is thematically better in line than they were before.