#19: Variables and comments also renamed.