Simplified naming