Rename (resolves #28)