This contains only renames and namespace updates.
These tests ensure the expected behaviour is not broken in the future.