Revert "Updated version"

This reverts commit 92de7e8fc5065d10b81c0e9dc03fddf9073042f1.
Some function name changes