Changed name generation, cleaned up anvil code