Added abreviations and some cleanup
Some renaming of resouces