Fix keyword shadowing