Create 2 images on upload naming issues

Upon recently upgrading my version of wordpress I have found that when uploading an image, wordpress has decided to switch up their naming conventions. Removing the .thumbnail from the name of the image when uploaded via the image uploader.

I have done some searching and actually found a way around this successfully.
https://blog.4rev.net/2008-06/wordpress-25-change-the-default-name-extension-for-thumbnail-image/

Unfortunately, this also breaks something new that wordpress has built in which creates a medium sized image ONLY if the image you upload is larger then the max width and height set within the admin.

What I would really like to be able to do is to have wordpress create 2 images and leave my original be. Something like:

/image.jpg // original image uploaded
/image.medium.jpg // sized to the medium image size set in the config
/image.thumbnail.jpg // sized to the thumb size set in config

Does anyone have any information that could get me started down the right path.
As of now I can easily create the original and the thumbnail however within the loop of setting the thumbnail image it only creates 1 image and bypasses the medium image with the above hack link in place.

Thanks.
Demetre