Fix for the duplicate identifiers in deifferent contextual classes