short names fix, refactoring

git-svn-id: http://farmanager.googlecode.com/svn/trunk@11496 ea59307d-ff68-5b67-5a21-acd59c66a581