Renaming for consistency
Fixed btcp message ordering bug