More renames
And compilation fixes after renames