Solve some naming issues