Fixed hard code names and allowed for overwriting old version