Cosmetic rename
Fix warnings