Changed method names (and deprecated old names) as per #110.