uniformize name, factor stric and freeze #fix 12 #fix 14