Fix capitalisation as per @pleroy's review, factor boilerplate definitions.