Naming; Fixed some structural issues