some tweaks to help reduce naming errors