Fixup some naming conventions and new Icons