2014
unified naming, fixed typos
cleanup