Fix of url rewrites and rewrite conflicts.
Correct class names in rewritten classes