a bit of renaming cannot be bad