Fix substracting.
Update naming.