changed names to make them smaller