More updates to notation to respect the conventions