shortened some builder names, added version