Update: Renaming, Code clearer for IBM1