MInor renaming, to fix name-clashed