I found that some weird rename was made by me in some uninspired moment. I reverted it in this commit.