Extended the names the the complete path for compatibility