Fixed wrong remainder from renaming