fixed some more issues around the rename…