Changed function names
Merge and upgrades names and returns offsets