regen components - using new library naming convention suggested by siggi