Drop "-calc" prefixes