Changed naming convention
Revert "Revert "More updates on the adds""

This reverts commit ef23c310e4361457a09ddc95e1ba1afebc39636c.