Changed some names to reflect the functionality better