Fixing some errors from rename changes