Icon fixes and various naming fixes