Thanks a lot for changing in all these places :). However, it will be cleaner if it would've been done in separate PR. But no issues. This is great.