Fix name clash and made things clearer