fix errors. wrong names, wrong locations