0.1.6.1: some renaming and deletio