Updated best practice naming conventions on files originally missed