Try to clean up notation and terminology