Now variables renamed too.