Lots of fixes, new naming convention
minor fixes