A bunch of renaming
Also removed the message body in favor of file handle ID only