Rename based on suggestions by @sebastianbergmann