Some renaming and StlyeCop tidying