Cleanup naming, remove some DataFrame functions