fixed conflicting resource names