fixed rules to use the new names