Name refactoring, fix compilation