Refactor Card function names