Name and module name moving

Just a thought because we may have a bunch of these things in the near future.