Clean up on syntax/naming in preparation for new pattern implementation