Change name, remove blockComment