fix naming chaos
SUNDRY NOTES