fix all fatal errors since renaming