Rename variables, add const modifier in printer