removed shortening of key names, per @navale's request.