Cleaned up manifest naming