Fixed shadowing detection error @ renaming - design improvements