Added uniform prefixes to the functions