fix naming issues
fixed after recking