Fix name clash and make things clearer