Add doc info and change name to an easier to identify name