Changed definitions to different variable type names