Some rafactoring and renaming.

Changed names of print methods.