Thread:Unatratnag/@comment-26159034-20150416160413/@comment-25737724-20150416214842

Ok, I think I've got them renamed. There's still cleanup to happen so if you see something wrong, feel free to fix it or ask.