Minor changes to avoid name clashing