Renames a few functions and adds range checkers