Updated step/rule naming conventions. Fixed minor issues.