Simplify; remove fn names that differ only in case