Rename files again as there is a recursive issue

see issue #4 comment number 3 and forward.