Refactor CLUSTER and SESSION to comply with PEP 8 naming conventions