Style and naming updates