Rename to BigName and more tests