Renaming stuff

Also changed __index stuff from bodies
Was harder than I expected