Big name change

See #1