NP. I said that I agreed and will be renamed on the next push.
Are there any other concerns with this PR? 
I'll do all changes at once