Combined Both naming conventions into one.