Use shorter names for constants, expand exports of constants

Plus a couple of random fixes