Naming changes, remove warnings by JustCode