Simplified function names (closes #2)