consolidating naming conventions, simplifying the inflation requirements