Version 1.2.1: minor renaming