Variable renames and return value big fix