Fixed scanner renaming issue