couple of fixes for renaming