@ project: some naming changed + doced