updated names and content location