Fixed the names so it's more modular now