Well Done! The naming convention updates are going to be very useful.