Migrated to 0.13.5-M1 along with its new AutoPlugin configuration.

Plus some naming standardisation.