Second update

Naming convention