Cleanup: renamed component filenames for consistency
Added extra `propTypes` for safety