I'm not sure where your reply to my comment went, but indeed you only moved the declaration, so you aren't expected to fix the inconsistent naming.