Removed rb extensions to function names