RFC: Finalizing more naming conventions