Some more work - renames, removes and additions :)