Naming fix
And notice fix