Adjusted name properties to match the context