rename and cleanup
wording
index updates