Moved standard names to StdDefs class, a few small fixes.
Merge origin/dev into dev