fixed the renaming issue

@vigsterkr @karlnapf 
take a look at this.